Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2016-11-04 #59

Merged
merged 7 commits into from
Nov 4, 2016
+142 −126
Merged

2016-11-04 #59

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc26987
Add 7 days and 30 days option to period range to allow date range sel…
sbessire Nov 2, 2016
fccbbf3
Change default parameters to look at the last 30 days instead of the …
sbessire Nov 3, 2016
71017fb
Changed dynamic-dialog modal html to render at end of file instead of…
jonesde Nov 3, 2016
0dbb4ff
Merge branch 'master' of github.com:sssonline/moqui-runtime
jonesde Nov 3, 2016
50b9fbd
form-list now puts all html form elements outside the table element s…
jonesde Nov 4, 2016
00f7e2e
Merge branch 'master' of [email protected]:moqui/moqui-runtime.git
jonesde Nov 4, 2016
f748095
A number of HTML cleanups to fix warnings and errors, some introduced…
jonesde Nov 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base-component/tools/screen/System/Security/ActiveUsers.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 2 additions & 4 deletions base-component/webroot/screen/includes/Header.html.ftl
View file
Original file line number Diff line number Diff line change
@@ -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" -->
5 changes: 2 additions & 3 deletions base-component/webroot/screen/includes/navbar.html.ftl
View file
Original file line number Diff line number Diff line change
@@ -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>
Loading