diff options
author | Simon Rettberg | 2014-10-09 16:01:11 +0200 |
---|---|---|
committer | Simon Rettberg | 2014-10-09 16:01:11 +0200 |
commit | e1dc0d3c99217504de2ac8467156274786efc0bd (patch) | |
tree | 130d7fed1fff8aaaffe5942cf2a3d6bb1dad03c8 /templates | |
parent | Minor fixes and improvements (diff) | |
download | slx-admin-e1dc0d3c99217504de2ac8467156274786efc0bd.tar.gz slx-admin-e1dc0d3c99217504de2ac8467156274786efc0bd.tar.xz slx-admin-e1dc0d3c99217504de2ac8467156274786efc0bd.zip |
Big load of changes
- Added callback functionality for taskmanager tasks. You can launch
a task and define a callback function to be run when the task finished.
This requires activating the cronjob
- Added cron functionality: Add cronjob that calls the cron api every 5
minutes to use it. (See cron.inc.php)
- Added eventlog
- Added missing translations
- Merged main-menu-login and main-menu-logout
Diffstat (limited to 'templates')
-rw-r--r-- | templates/eventlog/_page.html | 43 | ||||
-rw-r--r-- | templates/main-menu-login.html | 50 | ||||
-rw-r--r-- | templates/main-menu.html (renamed from templates/main-menu-logout.html) | 10 | ||||
-rw-r--r-- | templates/page-syslog.html | 30 |
4 files changed, 76 insertions, 57 deletions
diff --git a/templates/eventlog/_page.html b/templates/eventlog/_page.html new file mode 100644 index 00000000..910b2dd5 --- /dev/null +++ b/templates/eventlog/_page.html @@ -0,0 +1,43 @@ +<div class="container"> + <h1>{{lang_eventLog}}</h1> + {{{pagenav}}} + <table class="table table-striped table-condensed"> + <thead> + <th width="1"></th> + <th>{{lang_when}}</th> + <th>{{lang_event}}</th> + <th width="1">{{lang_details}}</th> + </thead> + <tbody> + {{#list}} + <tr> + <td><span class="glyphicon glyphicon-{{icon}}" title="{{logtypeid}}"></span></td> + <td class="text-right" nowrap="nowrap">{{date}}</td> + <td>{{description}}</td> + <td>{{#extra}} + <a class="btn btn-default btn-xs pull-left" onclick="$('#details-body').html($('#extra-{{logid}}').html())" data-toggle="modal" data-target="#myModal">»</a> + <div class="hidden" id="extra-{{logid}}">{{extra}}</div> + {{/extra}}</td> + </tr> + {{/list}} + </tbody> + </table> + {{{pagenav}}} +</div> + +<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog modal-lg"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> + <h4 class="modal-title" id="myModalLabel">{{lang_details}}</h4> + </div> + <div class="modal-body"> + <pre id="details-body"></pre> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + </div> + </div> + </div> +</div> diff --git a/templates/main-menu-login.html b/templates/main-menu-login.html deleted file mode 100644 index 06e729fe..00000000 --- a/templates/main-menu-login.html +++ /dev/null @@ -1,50 +0,0 @@ -<!-- Fixed navbar --> -<div class="navbar navbar-default navbar-fixed-top"> - <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="?do=Main">OpenSLX Admin</a> - </div> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - <li><a href="?do=SysLog">{{lang_clientLog}}</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{lang_settings}}<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li class="dropdown-header">{{lang_client}}</li> - <li><a href="?do=SysConfig">{{lang_localization}}</a></li> - <li><a href="?do=MiniLinux">bwLehrpool Mini-Linux</a></li> - <li><a href="?do=BaseConfig">{{lang_configurationVariables}}</a></li> - <li><a href="?do=Translation">{{lang_administration}}</a></li> - <li class="divider"></li> - <li class="dropdown-header">{{lang_server}}</li> - <li><a href="?do=ServerSetup">{{lang_configurationBasic}}</a></li> - <li><a href="?do=VmStore">{{lang_vmLocation}}</a></li> - </ul> - </li> - <li><a href="?do=News">{{lang_news}}</a></li> - <li><a href="?do=SystemStatus">Status</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a> - <ul class="dropdown-menu"> - <li class="dropdown-header">{{lang_language}}</li> - {{#langs}} - <li><a href="?lang={{cc}}&url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li> - {{/langs}} - </ul> - </li> - {{#dbupdate}} - <li><a href="api.php?do=update"><span class="slx-text-red"><span class="glyphicon glyphicon-exclamation-sign"></span> Update</span></a></li> - {{/dbupdate}} - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="?do=Session&action=login">{{lang_login}}</a></li> - </ul> - </div> - </div> -</div> - diff --git a/templates/main-menu-logout.html b/templates/main-menu.html index e70e1def..9cc053b9 100644 --- a/templates/main-menu-logout.html +++ b/templates/main-menu.html @@ -38,11 +38,19 @@ </ul> </li> {{#dbupdate}} - <li><a href="api.php?do=update"><span class="slx-text-red"><span class="glyphicon glyphicon-exclamation-sign"></span> Update</span></a></li> + <li><a href="api.php?do=update"><span class="slx-text-red badge"><span class="glyphicon glyphicon-exclamation-sign"></span> DB-Update</span></a></li> {{/dbupdate}} + {{#warning}} + <li><a href="?do=EventLog"><span class="slx-text-red badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_warning}}</span></a></li> + {{/warning}} </ul> <ul class="nav navbar-nav navbar-right"> + {{#user}} <li><a href="?do=Session&action=logout&token={{{token}}}"><b>{{user}}</b> ({{lang_logout}})</a></li> + {{/user}} + {{^user}} + <li><a href="?do=Session&action=login">{{lang_login}}</a></li> + {{/user}} </ul> </div> </div> diff --git a/templates/page-syslog.html b/templates/page-syslog.html index b7064619..123ac074 100644 --- a/templates/page-syslog.html +++ b/templates/page-syslog.html @@ -16,11 +16,11 @@ {{{pagenav}}} <table class="table table-striped table-condensed"> <thead> - <th></th> + <th width="1"></th> <th>{{lang_when}}</th> <th>{{lang_client}}</th> <th>{{lang_event}}</th> - <th>{{lang_details}}</th> + <th width="1">{{lang_details}}</th> </thead> <tbody> {{#list}} @@ -29,10 +29,10 @@ <td class="text-right" nowrap="nowrap">{{date}}</td> <td>{{clientip}}</td> <td>{{description}}</td> - <td>{{#extra}}<a class="btn btn-default btn-xs pull-left" data-toggle="collapse" data-target="#extra{{logid}}">»</a>{{/extra}}</td> - </tr> - <tr class="collapse" id="extra{{logid}}"> - <td colspan="5"><pre>{{extra}}</pre></td> + <td>{{#extra}} + <a class="btn btn-default btn-xs pull-left" onclick="$('#details-body').html($('#extra-{{logid}}').html())" data-toggle="modal" data-target="#myModal">»</a> + <div class="hidden" id="extra-{{logid}}">{{extra}}</div> + {{/extra}}</td> </tr> {{/list}} </tbody> @@ -40,3 +40,21 @@ {{{pagenav}}} </div> +<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog modal-lg"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> + <h4 class="modal-title" id="myModalLabel">{{lang_details}}</h4> + </div> + <div class="modal-body"> + <pre id="details-body"></pre> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + </div> + </div> + </div> +</div> + + |