diff options
author | Simon Rettberg | 2014-12-12 18:28:38 +0100 |
---|---|---|
committer | Simon Rettberg | 2014-12-12 18:28:38 +0100 |
commit | 97a0f7dcfdcf4a5263c1cc6c19160a0868abb5f2 (patch) | |
tree | cf735055cfb785ac64e60ab477e215f5f50ad767 /templates | |
parent | [news] fix xml tags of news api (diff) | |
download | slx-admin-97a0f7dcfdcf4a5263c1cc6c19160a0868abb5f2.tar.gz slx-admin-97a0f7dcfdcf4a5263c1cc6c19160a0868abb5f2.tar.xz slx-admin-97a0f7dcfdcf4a5263c1cc6c19160a0868abb5f2.zip |
Rework config module class structure. Still some TODOs though....
Diffstat (limited to 'templates')
-rw-r--r-- | templates/main-menu.html | 11 | ||||
-rw-r--r-- | templates/sysconfig/ad-checkconnection.html | 9 | ||||
-rw-r--r-- | templates/sysconfig/ad-finish.html | 2 | ||||
-rw-r--r-- | templates/sysconfig/start.html | 2 |
4 files changed, 17 insertions, 7 deletions
diff --git a/templates/main-menu.html b/templates/main-menu.html index 937b171c..77d5d5ee 100644 --- a/templates/main-menu.html +++ b/templates/main-menu.html @@ -37,7 +37,7 @@ </ul> </li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png" alt="{{current_lang}}"><b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="?do=Translation">{{lang_translations}}</a></li> <li class="dropdown-header">{{lang_language}}</li> @@ -58,7 +58,14 @@ </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> + <li> + <form method="post" action="?do=Session"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="logout"> + <b>{{user}}</b> + <button class="btn btn-default btn-xs" type="submit">{{lang_logout}}</button> + </form> + </li> {{/user}} {{^user}} <li><a href="?do=Session&action=login">{{lang_login}}</a></li> diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html index 0a1a8103..471208e8 100644 --- a/templates/sysconfig/ad-checkconnection.html +++ b/templates/sysconfig/ad-checkconnection.html @@ -8,7 +8,7 @@ </div> <br> <div class="pull-left"> - <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=AdModule_Start"> + <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=AdAuth_Start"> <input type="hidden" name="token" value="{{token}}"> <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> @@ -29,7 +29,7 @@ <input name="bindpw" value="{{bindpw}}" type="hidden"> <input name="home" value="{{home}}" type="hidden"> <input name="originalbinddn" value="{{binddn}}" type="hidden"> - <button id="nextbutton" type="submit" class="btn btn-primary">{{lang_skip}} »</button> + <button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_skip}} »</button> </form> </div> <script type="text/javascript"> @@ -38,11 +38,14 @@ if (!task || !task.statusCode) return; if (task.statusCode === 'TASK_FINISHED') { - $('#nextbutton').html('Weiter »'); + $('#nextbutton').html('Weiter »').show(); } if (task.statusCode === 'TASK_ERROR' || task.statusCode === 'PARENT_FAILED') { $('#nextbutton').html('Trotzdem weiter »'); } + if (task.statusCode === 'TASK_ERROR') { + $('#nextbutton').show(); + } } function selfCb(task) { diff --git a/templates/sysconfig/ad-finish.html b/templates/sysconfig/ad-finish.html index 61564b38..0a16fc70 100644 --- a/templates/sysconfig/ad-finish.html +++ b/templates/sysconfig/ad-finish.html @@ -7,7 +7,7 @@ </div> <br> <div id="back" class="pull-left" style="display:none"> - <a href="?do=SysConfig&action=addmodule&step=AdModule_Start" class="btn btn-primary">{{lang_restartWizard}}</a> + <a href="?do=SysConfig&action=addmodule&step=AdAuth_Start" class="btn btn-primary">{{lang_restartWizard}}</a> </div> <div id="finish" class="pull-right" style="display:none"> <a href="?do=SysConfig" class="btn btn-primary">{{lang_to}} {{lang_systemConfiguration}}</a> diff --git a/templates/sysconfig/start.html b/templates/sysconfig/start.html index f03444aa..f55a5501 100644 --- a/templates/sysconfig/start.html +++ b/templates/sysconfig/start.html @@ -3,7 +3,7 @@ {{#modules}} <div class="panel panel-default"> <div class="panel-heading"> - {{title}} <a href="?do=SysConfig&action=addmodule&step={{startClass}}" class="pull-right btn btn-primary btn-xs"><span class="glyphicon glyphicon-plus"></span> {{lang_add}}</a> + {{title}} <a href="?do=SysConfig&action=addmodule&step={{wizardClass}}" class="pull-right btn btn-primary btn-xs"><span class="glyphicon glyphicon-plus"></span> {{lang_add}}</a> </div> <div class="panel-body"> {{description}} |