Merge pull request #59 from sssonline/master

2016-11-04
moqui · Nov 4, 2016 · 63dea94 · 63dea94
2 parents 36c8726 + f748095
commit 63dea94
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 126 deletions.
diff --git a/base-component/tools/screen/System/Security/ActiveUsers.xml b/base-component/tools/screen/System/Security/ActiveUsers.xml
@@ -20,7 +20,7 @@ along with this software (see the LICENSE.md file). If not, see
     <actions>
         <entity-find entity-name="moqui.server.VisitUserSummary" list="visitUserList">
             <search-form-inputs default-order-by="-visitCount"><default-parameters
-                    fromDate_poffset="0" fromDate_period="Month"/></search-form-inputs>
+                    fromDate_poffset="-1" fromDate_period="30d"/></search-form-inputs>
             <select-field field-name="userId,visitCount,fromDateMin,fromDateMax"/>
         </entity-find>
     </actions>

diff --git a/base-component/webroot/screen/includes/Header.html.ftl b/base-component/webroot/screen/includes/Header.html.ftl
@@ -2,7 +2,6 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="Content-Type" content="text/html">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <#if html_keywords?has_content><meta name="keywords" content="${html_keywords}"></#if>
     <#if html_description?has_content><meta name="description" content="${html_description}"></#if>
@@ -19,16 +18,15 @@
 </#list>
 <#-- JavaScript -->
 <#list html_scripts?if_exists as scriptLocation>
-    <script language="javascript" src="${sri.buildUrl(scriptLocation).url}" type="text/javascript"></script>
+    <script src="${sri.buildUrl(scriptLocation).url}" type="text/javascript"></script>
 </#list>
 <#list sri.getThemeValues("STRT_SCRIPT") as scriptLocation>
-    <script language="javascript" src="${sri.buildUrl(scriptLocation).url}" type="text/javascript"></script>
+    <script src="${sri.buildUrl(scriptLocation).url}" type="text/javascript"></script>
 </#list>
 <#-- Icon -->
 <#list sri.getThemeValues("STRT_SHORTCUT_ICON") as iconLocation>
     <link rel="shortcut icon" href="${sri.buildUrl(iconLocation).url}">
 </#list>
 </head>
-
 <#assign bodyClassList = sri.getThemeValues("STRT_BODY_CLASS")>
 <body class="${(ec.user.getPreference("OUTER_STYLE")!(bodyClassList?first))!"bg-light"} ${(sri.screenUrlInfo.targetScreen.screenName)!""}<#if hideNav! == "true"> hide-nav</#if>"><!-- try "bg-dark" or "bg-light" -->
diff --git a/base-component/webroot/screen/includes/navbar.html.ftl b/base-component/webroot/screen/includes/navbar.html.ftl
@@ -1,4 +1,3 @@
-
 <nav class="navbar navbar-inverse navbar-fixed-top"><#-- navbar-static-top -->
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
@@ -47,9 +46,9 @@
                         <#if screenHistory.imageType == "icon">
                             <i class="${screenHistory.image}" style="padding-right: 8px;"></i>
                         <#elseif screenHistory.imageType == "url-plain">
-                            <img src="${screenHistory.image}" width="18" style="padding-right: 4px;"/>
+                            <img src="${screenHistory.image}" alt="${screenHistory.name}" width="18" style="padding-right: 4px;"/>
                         <#else>
-                            <img src="${sri.buildUrl(screenHistory.image).url}" height="18" style="padding-right: 4px;"/>
+                            <img src="${sri.buildUrl(screenHistory.image).url}" alt="${screenHistory.name}" height="18" style="padding-right: 4px;"/>
                         </#if>
                     <#else>
                         <i class="glyphicon glyphicon-link" style="padding-right: 8px;"></i>