Merge pull request #229 from mainmind83/google_fonts_https

farzindev · web-flow · commit d44b98bbd7a2 · 2021-04-02T12:01:45.000+04:30
Google fonts https
diff --git a/.gitignore b/.gitignore
@@ -186,3 +186,5 @@ BlogEngine/.vs/
 
 # Default extensions data
 BlogEngine/BlogEngine.NET/App_Data/datastore/extensions/*.xml
+/.vs/slnx.sqlite
+/.vs/BlogEngine.NET/config/applicationhost.config
diff --git a/BlogEngine/BlogEngine.NET/Account/account.master b/BlogEngine/BlogEngine.NET/Account/account.master
@@ -6,7 +6,7 @@
 <head id="Head1" runat="server">
     <title>Account Login</title>
     <meta name="description" content="Account Login Membership User Password" />
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'>
     <link href="account.css" rel="stylesheet" />
     <script src="../Scripts/jquery-2.1.4.min.js"></script>
     <script type="text/javascript" src="account.js"></script>
diff --git a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx
@@ -296,6 +296,9 @@
   <data name="contact" xml:space="preserve">
     <value>Contactarnos</value>
   </data>
+  <data name="share" xml:space="preserve">
+    <value>Compartir</value>
+  </data>
   <data name="contactForm" xml:space="preserve">
     <value>Formulario de Contacto</value>
   </data>
@@ -1736,4 +1739,4 @@
   <data name="phoneMain" xml:space="preserve">
     <value>Teléfono</value>
   </data>
-</root>
+</root>
diff --git a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx
@@ -2594,4 +2594,7 @@
   <data name="changeName" xml:space="preserve">
     <value>Change Name</value>
   </data>
+  <data name="share" xml:space="preserve">
+    <value>Share</value>
+  </data>
 </root>
diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx
@@ -75,15 +75,15 @@
         {%><span class="post-category"><i class="fa fa-folder-open"></i> <%=postCategory %></span>
         <% } %>
             <div class="dropdown post-share float-md-right">
-                <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-share-alt"></i>share</a>
+                <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-share-alt"></i><%=Resources.labels.share %></a>
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
                     <a class="dropdown-item item-fb" href="https://www.addtoany.com/add_to/facebook?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-facebook-square"></i>Facebook</a>
                     <a class="dropdown-item item-tw" href="https://www.addtoany.com/add_to/twitter?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-twitter-square"></i>Twitter</a>
                     <a class="dropdown-item item-gp" href="https://www.addtoany.com/add_to/google_plus?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-google-plus-square"></i>Google +</a>
                     <a class="dropdown-item item-ln" href="https://www.addtoany.com/add_to/linkedin?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-linkedin-square"></i>LinkedIn</a>
                     <a class="dropdown-item item-pi" href="https://www.addtoany.com/add_to/pinterest?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-pinterest-square"></i>Pinterest</a>
                     <a class="dropdown-item item-em" href="https://www.addtoany.com/add_to/email?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-envelope-square"></i>Email</a>
-                    <a class="dropdown-item item-em" href="https://www.addtoany.com/share?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-plus-square"></i>Share...</a>
+                    <a class="dropdown-item item-em" href="https://www.addtoany.com/share?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-plus-square"></i><%=Resources.labels.share %>...</a>
                 </div>
             </div>
         </div>
diff --git a/BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml b/BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml
@@ -24,7 +24,7 @@
 <html data-ng-app="blogAdmin">
 <head>
     <meta charset="utf-8" />
-    <link href='http://fonts.googleapis.com/css?family=Roboto:300,400,500' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500' rel='stylesheet' type='text/css'>
     @Styles.Render("~/Content/admincss")
     <link href="~/admin/themes/standard/css/styles.css" rel="stylesheet" type="text/css" />
     <script type="text/javascript">
diff --git a/BlogEngine/BlogEngine.NET/admin/themes/standard/layout.cshtml b/BlogEngine/BlogEngine.NET/admin/themes/standard/layout.cshtml
@@ -24,7 +24,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <title>@BlogSettings.Instance.Name (@Security.CurrentMembershipUser.UserName)</title>
-    <link href="http://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet">
     @Styles.Render("~/Content/admincss")
     <link href="~/admin/themes/standard/css/styles.css?ver=4" rel="stylesheet">
     <link rel="shortcut icon" href="@Href(Utils.ApplicationRelativeWebRoot + "Content/images/blog/blogengine.ico")" type="image/x-icon" />
