diff options
27 files changed, 602 insertions, 564 deletions
@@ -129,9 +129,7 @@ Message::renderList(); Page::render(); if (defined('CONFIG_DEBUG') && CONFIG_DEBUG) { - Render::openTag('div', array('class' => 'container')); Message::addWarning('debug-mode'); - Render::closeTag('div'); } if (defined('CONFIG_FOOTER')) { diff --git a/templates/backup/_page.html b/templates/backup/_page.html new file mode 100644 index 00000000..252ce18f --- /dev/null +++ b/templates/backup/_page.html @@ -0,0 +1,29 @@ +<h1>{{lang_backupRestore}}</h1> + +<form action="?do=Backup" method="post"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="backup"> + <div class="panel panel-default"> + <div class="panel-heading">{{lang_backup}}</div> + <div class="panel-body"> + <p>{{lang_backupDescription}}</p> + <button class="btn btn-primary" type="submit">{{lang_download}}</button> + </div> + </div> +</form> + +<form action="?do=Backup" method="post" enctype="multipart/form-data"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="restore"> + <div class="panel panel-default"> + <div class="panel-heading">{{lang_restore}}</div> + <div class="panel-body"> + <p>{{lang_restoreDescription}}</p> + <div class="input-group"> + <span class="input-group-addon">{{lang_file}}</span> + <input class="form-control" type="file" name="backupfile"> + </div> + <button class="btn btn-primary" type="submit">{{lang_restore}}</button> + </div> + </div> +</form>
\ No newline at end of file diff --git a/templates/backup/restore.html b/templates/backup/restore.html new file mode 100644 index 00000000..da5a9bce --- /dev/null +++ b/templates/backup/restore.html @@ -0,0 +1,27 @@ +<div class="panel panel-default"> + <div class="panel-heading">{{lang_backup}}</div> + <div class="panel-body"> + <div id="zeug"> + <div data-tm-id="{{syncid}}" data-tm-log="messages">{{lang_stopping}} syncdaemon</div> + <div data-tm-id="{{dmsdid}}" data-tm-log="messages">{{lang_stopping}} dmsd</div> + <div data-tm-id="{{ldadpid}}" data-tm-log="messages">{{lang_stopping}} ldadp</div> + <div data-tm-id="{{mountid}}" data-tm-log="messages">{{lang_stopping}} vmstore</div> + <div data-tm-id="{{restoreid}}" data-tm-log="messages" data-tm-callback="restoreCb">{{lang_restoreConfig}}</div> + <div data-tm-id="{{rebootid}}" data-tm-log="messages">{{lang_reboot}}</div> + </div> + <div id="restorefailed" style="display:none"> + {{lang_restoreFailed}} + </div> + </div> +</div> + +<script type="text/javascript"> + function restoreCb(task) + { + if (!task || !task.statusCode) + return; + if (task.statusCode === 'TASK_ERROR') { + $('#restorefailed').show('slow'); + } + } +</script> diff --git a/templates/baseconfig/_page.html b/templates/baseconfig/_page.html index 4829d124..f72a25f4 100644 --- a/templates/baseconfig/_page.html +++ b/templates/baseconfig/_page.html @@ -1,41 +1,39 @@ -<div class="container"> - <h1>{{lang_basicConfiguration}}</h1> - <form action="?do=BaseConfig" method="post"> - {{#categories}} - <div class="panel panel-default"> - <div class="panel-heading">{{category_name}}</div> - <div class="list-group"> - {{#settings}} - <div class="list-group-item"> - <div class="row"> - <div class="col-md-5"> - {{setting}} - <div class="slx-default">{{defaultvalue}}</div> - </div> - <div class="col-md-5"> - {{{item}}} - </div> - <div class="col-md-2"> - <a class="btn btn-default" data-toggle="modal" data-target="#help-{{setting}}">{{lang_help}}</a> - </div> +<h1>{{lang_basicConfiguration}}</h1> +<form action="?do=BaseConfig" method="post"> + {{#categories}} + <div class="panel panel-default"> + <div class="panel-heading">{{category_name}}</div> + <div class="list-group"> + {{#settings}} + <div class="list-group-item"> + <div class="row"> + <div class="col-md-5"> + {{setting}} + <div class="slx-default">{{defaultvalue}}</div> + </div> + <div class="col-md-5"> + {{{item}}} + </div> + <div class="col-md-2"> + <a class="btn btn-default" data-toggle="modal" data-target="#help-{{setting}}">{{lang_help}}</a> </div> </div> - <div class="modal fade" id="help-{{setting}}" tabindex="-1" role="dialog"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header">{{setting}}</div> - <div class="modal-body">{{{description}}}</div> - <div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div> - </div> + </div> + <div class="modal fade" id="help-{{setting}}" tabindex="-1" role="dialog"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header">{{setting}}</div> + <div class="modal-body">{{{description}}}</div> + <div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div> </div> </div> - {{/settings}} - </div> + </div> + {{/settings}} </div> - {{/categories}} - <input type="hidden" name="token" value="{{token}}"> - <button class="btn btn-lg btn-primary" type="submit">{{lang_save}}</button> - <button class="btn btn-lg btn-primary" type="reset">{{lang_reset}}</button> - <a class="btn btn-lg btn-primary" href="api.php?do=getconfig">Download</a> - </form> -</div> + </div> + {{/categories}} + <input type="hidden" name="token" value="{{token}}"> + <button class="btn btn-lg btn-primary" type="submit">{{lang_save}}</button> + <button class="btn btn-lg btn-primary" type="reset">{{lang_reset}}</button> + <a class="btn btn-lg btn-primary" href="api.php?do=getconfig">Download</a> +</form> diff --git a/templates/dialog-generic.html b/templates/dialog-generic.html index e2325ee9..5face8ce 100644 --- a/templates/dialog-generic.html +++ b/templates/dialog-generic.html @@ -1,15 +1,13 @@ -<div class="container"> - <div class="modal-dialog slx-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <h4 class="modal-title">{{title}}</h4> - </div> - <div class="modal-body"> - {{{body}}} - </div> - <div class="modal-footer"> - {{#next}}<a class="btn btn-primary" href="{{next}}">{{lang_next}} »</a>{{/next}} - </div> +<div class="modal-dialog slx-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <h4 class="modal-title">{{title}}</h4> + </div> + <div class="modal-body"> + {{{body}}} + </div> + <div class="modal-footer"> + {{#next}}<a class="btn btn-primary" href="{{next}}">{{lang_next}} »</a>{{/next}} </div> </div> -</div> +</div>
\ No newline at end of file diff --git a/templates/eventlog/_page.html b/templates/eventlog/_page.html index b28fe2f0..2e657805 100644 --- a/templates/eventlog/_page.html +++ b/templates/eventlog/_page.html @@ -1,29 +1,27 @@ -<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 class="{{color}}">{{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> +<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 class="{{color}}">{{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 class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-dialog modal-lg"> diff --git a/templates/footer.html b/templates/footer.html index a89a4338..603c0f83 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,2 +1,2 @@ <hr> -<div class="pull-right">{{text}}</div> +<div class="pull-right slx-footer">{{text}}</div> diff --git a/templates/main-menu.html b/templates/main-menu.html index afc948c9..7f376a4a 100644 --- a/templates/main-menu.html +++ b/templates/main-menu.html @@ -15,6 +15,7 @@ <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=News">{{lang_news}}</a></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> @@ -23,9 +24,9 @@ <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> + <li><a href="?do=Backup">{{lang_backup}}</a></li> </ul> </li> - <li><a href="?do=News">{{lang_news}}</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{lang_status}}<b class="caret"></b></a> <ul class="dropdown-menu"> diff --git a/templates/page-adduser.html b/templates/page-adduser.html index 08b6063e..50af8267 100644 --- a/templates/page-adduser.html +++ b/templates/page-adduser.html @@ -1,28 +1,26 @@ -<div class="container"> - <form class="form-adduser" action="?do=AddUser" method="post"> - <h2 class="form-signin-heading">{{lang_createUser}}</h2> - <div class="row"> - <div class="col-md-4">{{lang_username}} *</div> - <div class="col-md-4"><input type="text" name="user" value="{{user}}" class="form-control" placeholder="{{lang_username}}" autofocus></div> - </div> - <div class="row"> - <div class="col-md-4">{{lang_password}} *</div> - <div class="col-md-4"><input type="password" name="pass1" class="form-control" placeholder="{{lang_password}}"></div> - <div class="col-md-4"><input type="password" name="pass2" class="form-control" placeholder="{{lang_confirmation}}"></div> - </div> - <div class="row"> - <div class="col-md-4">{{lang_fullName}} *</div> - <div class="col-md-4"><input type="text" name="fullname" value="{{fullname}}" class="form-control" placeholder="{{lang_fullName}}"></div> - </div> - <div class="row"> - <div class="col-md-4">{{lang_telephone}}</div> - <div class="col-md-4"><input type="text" name="phone" value="{{phone}}" class="form-control" placeholder="{{lang_telephone}}"></div> - </div> - <div class="row"> - <div class="col-md-4">E-Mail</div> - <div class="col-md-4"><input type="text" name="email" value="{{email}}" class="form-control" placeholder="E-Mail"></div> - </div> - <button class="btn btn-lg btn-primary btn-block" type="submit">{{lang_createUser}}</button> - <input type="hidden" name="action" value="adduser"> - </form> -</div> +<form class="form-adduser" action="?do=AddUser" method="post"> + <h2 class="form-signin-heading">{{lang_createUser}}</h2> + <div class="row"> + <div class="col-md-4">{{lang_username}} *</div> + <div class="col-md-4"><input type="text" name="user" value="{{user}}" class="form-control" placeholder="{{lang_username}}" autofocus></div> + </div> + <div class="row"> + <div class="col-md-4">{{lang_password}} *</div> + <div class="col-md-4"><input type="password" name="pass1" class="form-control" placeholder="{{lang_password}}"></div> + <div class="col-md-4"><input type="password" name="pass2" class="form-control" placeholder="{{lang_confirmation}}"></div> + </div> + <div class="row"> + <div class="col-md-4">{{lang_fullName}} *</div> + <div class="col-md-4"><input type="text" name="fullname" value="{{fullname}}" class="form-control" placeholder="{{lang_fullName}}"></div> + </div> + <div class="row"> + <div class="col-md-4">{{lang_telephone}}</div> + <div class="col-md-4"><input type="text" name="phone" value="{{phone}}" class="form-control" placeholder="{{lang_telephone}}"></div> + </div> + <div class="row"> + <div class="col-md-4">E-Mail</div> + <div class="col-md-4"><input type="text" name="email" value="{{email}}" class="form-control" placeholder="E-Mail"></div> + </div> + <button class="btn btn-lg btn-primary btn-block" type="submit">{{lang_createUser}}</button> + <input type="hidden" name="action" value="adduser"> +</form>
\ No newline at end of file diff --git a/templates/page-login.html b/templates/page-login.html index 7b9f5df7..556c162a 100644 --- a/templates/page-login.html +++ b/templates/page-login.html @@ -1,13 +1,11 @@ -<div class="container"> - <form class="form-signin" action="?do=Session" method="post"> - <h2 class="form-signin-heading">{{lang_enter}}</h2> - <input type="text" name="user" class="form-control" placeholder="{{lang_username}}" autofocus> - <input type="password" name="pass" class="form-control" placeholder="{{lang_password}}"> - <label class="checkbox"> - <input type="checkbox" name="remember" value="remember-me"> {{lang_rememberID}} - </label> - <button class="btn btn-lg btn-primary btn-block" type="submit">{{lang_login}}</button> - <a class="btn btn-lg btn-primary btn-block" href="?do=AddUser">{{lang_register}}</a> - <input type="hidden" name="action" value="login"> - </form> -</div> +<form class="form-signin" action="?do=Session" method="post"> + <h2 class="form-signin-heading">{{lang_enter}}</h2> + <input type="text" name="user" class="form-control" placeholder="{{lang_username}}" autofocus> + <input type="password" name="pass" class="form-control" placeholder="{{lang_password}}"> + <label class="checkbox"> + <input type="checkbox" name="remember" value="remember-me"> {{lang_rememberID}} + </label> + <button class="btn btn-lg btn-primary btn-block" type="submit">{{lang_login}}</button> + <a class="btn btn-lg btn-primary btn-block" href="?do=AddUser">{{lang_register}}</a> + <input type="hidden" name="action" value="login"> +</form>
\ No newline at end of file diff --git a/templates/page-minilinux.html b/templates/page-minilinux.html index 1cb9d9dd..df245ef0 100644 --- a/templates/page-minilinux.html +++ b/templates/page-minilinux.html @@ -1,4 +1,4 @@ -<div class="container" id="systemlist"> +<div id="systemlist"> <div class="panel panel-default">{{lang_listObtained}}</div> <script type="text/javascript"> var slx_check = setInterval(function() { diff --git a/templates/page-news.html b/templates/page-news.html index 78d1d85a..0c56069c 100644 --- a/templates/page-news.html +++ b/templates/page-news.html @@ -1,59 +1,57 @@ -<div class="container"> - <p>{{lang_newsIntro}}</p> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_activeNews}} - </div> - <div class="panel-body"> - <form action="?do=News&action=save" method="post"> - <div class="form-group"> - <label for="news-title-id">{{lang_title}}</label> - <input type="text" name="news-title" id ="news-title-id" class="form-control" placeholder="{{welcome}}" value="{{latestTitle}}"> - </div> - <div class="form-group"> - <label for="news-content-id">{{lang_content}}</label> - <textarea name="news-content" id ="news-content-id" class="form-control" rows="5" cols="30" placeholder="">{{latestContent}}</textarea> - </div> - <p>{{lang_latestUpdate}}: {{latestDate}}</p> - <button class="btn btn-primary btn-sm" type="submit">{{lang_save}}</button> - <input type="hidden" name="token" value="{{token}}"> - </form> - </div> +<p>{{lang_newsIntro}}</p> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_activeNews}} </div> - - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_newsOld}} - </div> - <div class="panel-body"> - <div class="table-responsive"> - <form method="post" action="?do=News&action=delete"> - <input type="hidden" name="token" value="{{token}}"> - <table class="table table-stripped table-condensed"> - <thead> - <tr> - <th>{{lang_date}}</th> - <th>{{lang_title}}</th> - <th>{{lang_content}}</th> - <th></th> - </tr> - </thead> - <tbody> - {{#list}} - <tr {{#active}}class="active"{{/active}}> - <td class="text-left nowrap">{{date}}</td> - <td class="slx-ellipsis">{{title}}</td> - <td class="slx-ellipsis">{{content}}</td> - <td> - <a class="btn btn-primary btn-xs" href="?do=news&newsid={{newsid}}&action=show"><span class="glyphicon glyphicon-share-alt"></span> {{lang_show}}</a> - <button class="btn btn-danger btn-xs" type="submit" name="newsid" value="{{newsid}}"><span class="glyphicon glyphicon-remove"></span> {{lang_delete}}</button> - </td> - </tr> - {{/list}} - </tbody> - </table> - </form> + <div class="panel-body"> + <form action="?do=News&action=save" method="post"> + <div class="form-group"> + <label for="news-title-id">{{lang_title}}</label> + <input type="text" name="news-title" id ="news-title-id" class="form-control" placeholder="{{welcome}}" value="{{latestTitle}}"> + </div> + <div class="form-group"> + <label for="news-content-id">{{lang_content}}</label> + <textarea name="news-content" id ="news-content-id" class="form-control" rows="5" cols="30" placeholder="">{{latestContent}}</textarea> </div> + <p>{{lang_latestUpdate}}: {{latestDate}}</p> + <button class="btn btn-primary btn-sm" type="submit">{{lang_save}}</button> + <input type="hidden" name="token" value="{{token}}"> + </form> + </div> +</div> + +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_newsOld}} + </div> + <div class="panel-body"> + <div class="table-responsive"> + <form method="post" action="?do=News&action=delete"> + <input type="hidden" name="token" value="{{token}}"> + <table class="table table-stripped table-condensed"> + <thead> + <tr> + <th>{{lang_date}}</th> + <th>{{lang_title}}</th> + <th>{{lang_content}}</th> + <th></th> + </tr> + </thead> + <tbody> + {{#list}} + <tr {{#active}}class="active"{{/active}}> + <td class="text-left nowrap">{{date}}</td> + <td class="slx-ellipsis">{{title}}</td> + <td class="slx-ellipsis">{{content}}</td> + <td> + <a class="btn btn-primary btn-xs" href="?do=news&newsid={{newsid}}&action=show"><span class="glyphicon glyphicon-share-alt"></span> {{lang_show}}</a> + <button class="btn btn-danger btn-xs" type="submit" name="newsid" value="{{newsid}}"><span class="glyphicon glyphicon-remove"></span> {{lang_delete}}</button> + </td> + </tr> + {{/list}} + </tbody> + </table> + </form> </div> </div> </div> diff --git a/templates/page-remote-tgz-list.html b/templates/page-remote-tgz-list.html deleted file mode 100644 index 1cf2ee84..00000000 --- a/templates/page-remote-tgz-list.html +++ /dev/null @@ -1,16 +0,0 @@ -<ol class="breadcrumb"> - <li><a href="?do=Main">Home</a></li> - <li><a href="?do=SysConfig">{{lang_systemConfiguration}}</a></li> - <li class="active">{{lang_centralConfiguration}}</li> -</ol> -<div class="container"> - {{#files}} - <div class="panel panel-default"> - <div class="panel-heading"><h4><a class="btn btn-success" href="#" onclick="this.style.display='none';loadContent('#{{id}}', 'api.php?do=download&type=tgz&file={{file}}&id={{id}}')">Download</a> » {{file}}</h4></div> - <div class="panel-body" id="{{id}}">{{description}}</div> - </div> - {{/files}} - {{^files}} - <div class="row well well-sm">{{lang_configurationPackageNotFound}}</div> - {{/files}} -</div> diff --git a/templates/page-syslog.html b/templates/page-syslog.html index 123ac074..7cedd7f3 100644 --- a/templates/page-syslog.html +++ b/templates/page-syslog.html @@ -1,44 +1,42 @@ -<div class="container"> - <h1>{{lang_clientLog}}</h1> - <form method="post" action="?do=SysLog"> - <input type="hidden" name="token" value="{{token}}"> - <div class="input-group"> - <span class="input-group-addon">{{lang_filter}}</span> - <input id="filterstring" type="text" placeholder="id" value="{{filter}}" name="filter" data-role="tagsinput" /> - <span class="input-group-addon"> - <input type="checkbox" name="not" {{#not}}checked="checked"{{/not}}> {{lang_not}} - </span> - <span class="input-group-btn"> - <button class="btn btn-default" type="submit">{{lang_go}}</button> - </span> - </div> - </form> - {{{pagenav}}} - <table class="table table-striped table-condensed"> - <thead> - <th width="1"></th> - <th>{{lang_when}}</th> - <th>{{lang_client}}</th> - <th>{{lang_event}}</th> - <th width="1">{{lang_details}}</th> - </thead> - <tbody> - {{#list}} - <tr> - <td><span class="glyphicon glyphicon-off" title="{{logtypeid}}" onclick="$('#filterstring').tagsinput('add', '{{logtypeid}}')"></span></td> - <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" 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> +<h1>{{lang_clientLog}}</h1> +<form method="post" action="?do=SysLog"> + <input type="hidden" name="token" value="{{token}}"> + <div class="input-group"> + <span class="input-group-addon">{{lang_filter}}</span> + <input id="filterstring" type="text" placeholder="id" value="{{filter}}" name="filter" data-role="tagsinput" /> + <span class="input-group-addon"> + <input type="checkbox" name="not" {{#not}}checked="checked"{{/not}}> {{lang_not}} + </span> + <span class="input-group-btn"> + <button class="btn btn-default" type="submit">{{lang_go}}</button> + </span> + </div> +</form> +{{{pagenav}}} +<table class="table table-striped table-condensed"> + <thead> + <th width="1"></th> + <th>{{lang_when}}</th> + <th>{{lang_client}}</th> + <th>{{lang_event}}</th> + <th width="1">{{lang_details}}</th> + </thead> + <tbody> + {{#list}} + <tr> + <td><span class="glyphicon glyphicon-off" title="{{logtypeid}}" onclick="$('#filterstring').tagsinput('add', '{{logtypeid}}')"></span></td> + <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" 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 class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-dialog modal-lg"> diff --git a/templates/page-vmstore.html b/templates/page-vmstore.html index 255bf64d..ba000fed 100644 --- a/templates/page-vmstore.html +++ b/templates/page-vmstore.html @@ -1,69 +1,67 @@ -<div class="container"> - <form role="form" method="post" action="?do=VmStore"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="setstore"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_vmLocation}} <a class="btn btn-default" data-toggle="modal" data-target="#help-store"><span class="glyphicon glyphicon-question-sign"></span></a> +<form role="form" method="post" action="?do=VmStore"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="setstore"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_vmLocation}} <a class="btn btn-default" data-toggle="modal" data-target="#help-store"><span class="glyphicon glyphicon-question-sign"></span></a> + </div> + <div class="panel-body slx-md-width"> + <p>{{lang_vmLocationChoose}}</p> + <div class="panel panel-default"> + <div class="panel-heading"> + <input type="radio" name="storetype" value="internal" {{pre-internal}}> {{lang_intern}} + </div> + <div class="panel-body"> + {{lang_noAdditionalInformation}} + </div> </div> - <div class="panel-body slx-md-width"> - <p>{{lang_vmLocationChoose}}</p> - <div class="panel panel-default"> - <div class="panel-heading"> - <input type="radio" name="storetype" value="internal" {{pre-internal}}> {{lang_intern}} - </div> - <div class="panel-body"> - {{lang_noAdditionalInformation}} - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <input type="radio" name="storetype" value="nfs" {{pre-nfs}}> NFS + <a class="btn btn-default btn-sm" data-toggle="modal" data-target="#help-nfs"><span class="glyphicon glyphicon-question-sign"></span></a> </div> - <div class="panel panel-default"> - <div class="panel-heading"> - <input type="radio" name="storetype" value="nfs" {{pre-nfs}}> NFS - <a class="btn btn-default btn-sm" data-toggle="modal" data-target="#help-nfs"><span class="glyphicon glyphicon-question-sign"></span></a> - </div> - <div class="panel-body"> - <label for="nfsaddr">NFS-Export</label> - <input type="text" class="form-control" name="nfsaddr" value="{{nfsaddr}}" placeholder="1.2.3.4:/export/bwlp" id="nfsaddr"> - </div> + <div class="panel-body"> + <label for="nfsaddr">NFS-Export</label> + <input type="text" class="form-control" name="nfsaddr" value="{{nfsaddr}}" placeholder="1.2.3.4:/export/bwlp" id="nfsaddr"> + </div> + </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <input type="radio" name="storetype" value="cifs" {{pre-cifs}}> CIFS </div> - <div class="panel panel-default"> - <div class="panel-heading"> - <input type="radio" name="storetype" value="cifs" {{pre-cifs}}> CIFS + <div class="panel-body"> + <label for="cifsaddr">UNC-Pfad</label> + <input type="text" class="form-control" name="cifsaddr" value="{{cifsaddr}}" placeholder="\\samba.server.example.com\bwlp" id="cifsaddr"> + <br> + <label for="cifsuser">{{lang_readWrite}}</label> + <div class="input-group"> + <span class="input-group-addon slx-ga"> + {{lang_username}} + </span> + <input type="text" class="form-control" name="cifsuser" value="{{cifsuser}}" placeholder="{{lang_username}}" id="cifsuser"> + <span class="input-group-addon"> + {{lang_password}} + </span> + <input type="text" class="form-control" name="cifspasswd" value="{{cifspasswd}}" placeholder="{{lang_password}}"> </div> - <div class="panel-body"> - <label for="cifsaddr">UNC-Pfad</label> - <input type="text" class="form-control" name="cifsaddr" value="{{cifsaddr}}" placeholder="\\samba.server.example.com\bwlp" id="cifsaddr"> - <br> - <label for="cifsuser">{{lang_readWrite}}</label> - <div class="input-group"> - <span class="input-group-addon slx-ga"> - {{lang_username}} - </span> - <input type="text" class="form-control" name="cifsuser" value="{{cifsuser}}" placeholder="{{lang_username}}" id="cifsuser"> - <span class="input-group-addon"> - {{lang_password}} - </span> - <input type="text" class="form-control" name="cifspasswd" value="{{cifspasswd}}" placeholder="{{lang_password}}"> - </div> - <br> - <label for="cifsuserro">{{lang_readOnly}}</label> - <div class="input-group"> - <span class="input-group-addon slx-ga"> - {{lang_username}} - </span> - <input type="text" class="form-control" name="cifsuserro" value="{{cifsuserro}}" placeholder="{{lang_username}}" id="cifsuserro"> - <span class="input-group-addon"> - {{lang_password}} - </span> - <input type="text" class="form-control" name="cifspasswdro" value="{{cifspasswdro}}" placeholder="{{lang_password}}"> - </div> + <br> + <label for="cifsuserro">{{lang_readOnly}}</label> + <div class="input-group"> + <span class="input-group-addon slx-ga"> + {{lang_username}} + </span> + <input type="text" class="form-control" name="cifsuserro" value="{{cifsuserro}}" placeholder="{{lang_username}}" id="cifsuserro"> + <span class="input-group-addon"> + {{lang_password}} + </span> + <input type="text" class="form-control" name="cifspasswdro" value="{{cifspasswdro}}" placeholder="{{lang_password}}"> </div> </div> - <button class="btn btn-primary" type="submit">{{lang_save}}</button> </div> + <button class="btn btn-primary" type="submit">{{lang_save}}</button> </div> - </form> -</div> + </div> +</form> <div class="modal fade" id="help-store" tabindex="-1" role="dialog"> <div class="modal-dialog"> diff --git a/templates/pagenav.html b/templates/pagenav.html index 5cab6a46..93194999 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -13,3 +13,4 @@ {{/current}} {{/pages}} </ul> +<div class="clearfix"></div>
\ No newline at end of file diff --git a/templates/serversetup/ipaddress.html b/templates/serversetup/ipaddress.html index acfbb408..e4967703 100644 --- a/templates/serversetup/ipaddress.html +++ b/templates/serversetup/ipaddress.html @@ -1,36 +1,34 @@ -<div class="container"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_bootAddress}} - </div> - <div class="panel-body"> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_bootAddress}} + </div> + <div class="panel-body"> + <p> + {{lang_chooseIP}} + </p> + <form method="post" action="?do=ServerSetup"> + <input type="hidden" name="action" value="ip"> + <input type="hidden" name="token" value="{{token}}"> + <table class="slx-table"> + {{#ips}} + <tr> + <td>{{ip}}</td> + {{#default}} + <td> + <span class="btn btn-success btn-xs"><span class="glyphicon glyphicon-ok"></span> {{lang_active}}</span> + </td> + {{/default}} + {{^default}} + <td> + <button class="btn btn-primary btn-xs" name="ip" value="{{ip}}"><span class="glyphicon glyphicon-flag"></span> {{lang_set}}</button> + </td> + {{/default}} + </tr> + {{/ips}} + </table> <p> - {{lang_chooseIP}} + {{lang_bootHint}} </p> - <form method="post" action="?do=ServerSetup"> - <input type="hidden" name="action" value="ip"> - <input type="hidden" name="token" value="{{token}}"> - <table class="slx-table"> - {{#ips}} - <tr> - <td>{{ip}}</td> - {{#default}} - <td> - <span class="btn btn-success btn-xs"><span class="glyphicon glyphicon-ok"></span> {{lang_active}}</span> - </td> - {{/default}} - {{^default}} - <td> - <button class="btn btn-primary btn-xs" name="ip" value="{{ip}}"><span class="glyphicon glyphicon-flag"></span> {{lang_set}}</button> - </td> - {{/default}} - </tr> - {{/ips}} - </table> - <p> - {{lang_bootHint}} - </p> - </form> - </div> + </form> </div> -</div> +</div>
\ No newline at end of file diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html index 772777d1..21f3d87b 100644 --- a/templates/serversetup/ipxe.html +++ b/templates/serversetup/ipxe.html @@ -1,44 +1,42 @@ -<div class="container"> - <form method="post" action="?do=ServerSetup"> - <input type="hidden" name="action" value="ipxe"> - <input type="hidden" name="token" value="{{token}}"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_bootMenu}} - </div> - <div class="panel-body"> - <p> - {{lang_bootInfo}} - </p> - <br> - - <div class="form-group"> - <strong>{{lang_bootBehavior}}</strong> - <label class="radio"><input type="radio" name="defaultentry" value="net" {{active-net}}> bwLehrpool</label> - <label class="radio"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}> {{lang_localHDD}}</label> - <label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> "my-entry"</label> - </div> +<form method="post" action="?do=ServerSetup"> + <input type="hidden" name="action" value="ipxe"> + <input type="hidden" name="token" value="{{token}}"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_bootMenu}} + </div> + <div class="panel-body"> + <p> + {{lang_bootInfo}} + </p> + <br> - <div class="form-group"> - <strong>{{lang_menuDisplayTime}}</strong> - <div class="input-group form-narrow"> - <input type="text" class="form-control" name="timeout" value="{{timeout}}" pattern="\d+"> - <span class="input-group-addon">{{lang_seconds}}</span> - </div> - </div> + <div class="form-group"> + <strong>{{lang_bootBehavior}}</strong> + <label class="radio"><input type="radio" name="defaultentry" value="net" {{active-net}}> bwLehrpool</label> + <label class="radio"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}> {{lang_localHDD}}</label> + <label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> "my-entry"</label> + </div> - <div class="form-group"> - <strong>{{lang_menuCustom}}</strong> <a class="btn btn-default btn-xs" data-toggle="modal" data-target="#help-custom"><span class="glyphicon glyphicon-question-sign"></span></a> - <textarea class="form-control" name="custom">{{custom}}</textarea> + <div class="form-group"> + <strong>{{lang_menuDisplayTime}}</strong> + <div class="input-group form-narrow"> + <input type="text" class="form-control" name="timeout" value="{{timeout}}" pattern="\d+"> + <span class="input-group-addon">{{lang_seconds}}</span> </div> </div> - <div class="panel-footer"> - <button class="btn btn-primary" name="action" value="ipxe">{{lang_bootMenuCreate}}</button> + <div class="form-group"> + <strong>{{lang_menuCustom}}</strong> <a class="btn btn-default btn-xs" data-toggle="modal" data-target="#help-custom"><span class="glyphicon glyphicon-question-sign"></span></a> + <textarea class="form-control" name="custom">{{custom}}</textarea> </div> </div> - </form> -</div> + + <div class="panel-footer"> + <button class="btn btn-primary" name="action" value="ipxe">{{lang_bootMenuCreate}}</button> + </div> + </div> +</form> <div class="modal fade" id="help-custom" tabindex="-1" role="dialog"> <div class="modal-dialog"> diff --git a/templates/sysconfig/_page.html b/templates/sysconfig/_page.html index af0d598a..0fe46d0b 100644 --- a/templates/sysconfig/_page.html +++ b/templates/sysconfig/_page.html @@ -1,84 +1,85 @@ -<div class="container"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_availableSystem}} - <a class="btn btn-default" data-toggle="modal" data-target="#help-config"><span class="glyphicon glyphicon-question-sign"></span></a> - </div> - <div class="panel-body"> - <form method="post" action="?do=SysConfig"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="config"> - <table class="slx-table"> - {{#configs}} - <tr> - <td>{{config}}</td> - <td> - {{^current}} - <button class="btn btn-primary btn-xs" name="activate" value="{{configid}}"> - <span class="glyphicon glyphicon-flag"></span> - {{lang_activate}} - </button> - {{/current}} - {{#current}} - <span class="btn btn-success btn-xs"> - <span class="glyphicon glyphicon-ok"></span> - {{lang_active}} - </span> - {{/current}} - </td> - <td> - <button class="btn btn-danger btn-xs" name="del" value="{{configid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button> - </td> - </tr> - {{/configs}} - </table> - {{^configs}} - <div class="alert alert-warning"> - {{lang_systemConfigurationNotFound}} - </div> - {{^modules}} - <div class="alert alert-danger"> - {{lang_systemConfigurationAlert}} - </div> - {{/modules}} - {{/configs}} - </form> - </div> - <div class="panel-footer"> - <a class="btn btn-primary" href="?do=SysConfig&action=addconfig">{{lang_newConfiguration}}</a> - </div> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_availableSystem}} + <a class="btn btn-default" data-toggle="modal" data-target="#help-config"><span class="glyphicon glyphicon-question-sign"></span></a> </div> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_availableModules}} - <a class="btn btn-default" data-toggle="modal" data-target="#help-module"><span class="glyphicon glyphicon-question-sign"></span></a> - </div> - <div class="panel-body"> - <form method="post" action="?do=SysConfig"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="module"> - <table class="slx-table"> - {{#modules}} - <tr> - <td>{{module}}</td> - <td> - <button class="btn btn-default btn-xs" name="list" value="{{moduleid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button> - <!-- a class="btn btn-default btn-xs"><span class="glyphicon glyphicon-edit"></span> Bearbeiten</a --> - </td> - <td> - <button class="btn btn-danger btn-xs" name="del" value="{{moduleid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button> - </td> - </tr> - {{/modules}} - </table> - {{^modules}} - <div class="alert alert-warning">{{lang_configurationModuleNotFound}}</div> - {{/modules}} - </form> - </div> - <div class="panel-footer"> - <a class="btn btn-primary" href="?do=SysConfig&action=addmodule">{{lang_newModule}}</a> - </div> + <div class="panel-body"> + <form method="post" action="?do=SysConfig"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="config"> + <table class="slx-table"> + {{#configs}} + <tr> + <td>{{config}}</td> + <td> + {{^current}} + <button class="btn btn-primary btn-xs" name="activate" value="{{configid}}"> + <span class="glyphicon glyphicon-flag"></span> + {{lang_activate}} + </button> + {{/current}} + {{#current}} + <span class="btn btn-success btn-xs"> + <span class="glyphicon glyphicon-ok"></span> + {{lang_active}} + </span> + {{/current}} + </td> + <td> + <button class="btn btn-default btn-xs" name="list" value="{{configid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button> + </td> + <td> + <button class="btn btn-danger btn-xs" name="del" value="{{configid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button> + </td> + </tr> + {{/configs}} + </table> + {{^configs}} + <div class="alert alert-warning"> + {{lang_systemConfigurationNotFound}} + </div> + {{^modules}} + <div class="alert alert-danger"> + {{lang_systemConfigurationAlert}} + </div> + {{/modules}} + {{/configs}} + </form> + </div> + <div class="panel-footer"> + <a class="btn btn-primary" href="?do=SysConfig&action=addconfig">{{lang_newConfiguration}}</a> + </div> +</div> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_availableModules}} + <a class="btn btn-default" data-toggle="modal" data-target="#help-module"><span class="glyphicon glyphicon-question-sign"></span></a> + </div> + <div class="panel-body"> + <form method="post" action="?do=SysConfig"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="module"> + <table class="slx-table"> + {{#modules}} + <tr> + <td>{{module}}</td> + <td> + <button class="btn btn-default btn-xs" name="list" value="{{moduleid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button> + <!-- a class="btn btn-default btn-xs"><span class="glyphicon glyphicon-edit"></span> Bearbeiten</a --> + </td> + <td> + <button class="btn btn-danger btn-xs" name="del" value="{{moduleid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button> + </td> + </tr> + {{/modules}} + </table> + {{^modules}} + <div class="alert alert-warning">{{lang_configurationModuleNotFound}}</div> + {{/modules}} + </form> + </div> + <div class="panel-footer"> + <a class="btn btn-primary" href="?do=SysConfig&action=addmodule">{{lang_newModule}}</a> </div> </div> diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html index eb4afea2..0a1a8103 100644 --- a/templates/sysconfig/ad-checkconnection.html +++ b/templates/sysconfig/ad-checkconnection.html @@ -10,6 +10,7 @@ <div class="pull-left"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=AdModule_Start"> <input type="hidden" name="token" value="{{token}}"> + <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> <input name="binddn" value="{{binddn}}" type="hidden"> @@ -21,6 +22,7 @@ <div class="pull-right"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step={{step}}"> <input type="hidden" name="token" value="{{token}}"> + <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> <input id="setdn" name="binddn" value="{{binddn}}" type="hidden"> diff --git a/templates/sysconfig/ad-start.html b/templates/sysconfig/ad-start.html index f14f639b..007bc8db 100644 --- a/templates/sysconfig/ad-start.html +++ b/templates/sysconfig/ad-start.html @@ -13,29 +13,33 @@ <form role="form" method="post" action="?do=SysConfig&action=addmodule&step={{step}}"> <input type="hidden" name="token" value="{{token}}"> <div class="input-group"> + <span class="input-group-addon slx-ga">{{lang_moduleTitle}}</span> + <input tabindex="1" name="title" value="{{title}}" type="text" class="form-control"> + </div> + <div class="input-group"> <span class="input-group-addon slx-ga">Server *</span> - <input tabindex="1" name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com"> + <input tabindex="2" name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com"> <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> </span--> </div> <div class="input-group"> <span class="input-group-addon slx-ga">{{lang_bindDN}} *</span> - <input tabindex="2" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="domain\bwlp *ODER* CN=bwlp,OU=Benutzer,DC=domain,DC=hs-beispiel,DC=de"> + <input tabindex="3" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="domain\bwlp *ODER* CN=bwlp,OU=Benutzer,DC=domain,DC=hs-beispiel,DC=de"> <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> </span--> </div> <div class="input-group"> <span class="input-group-addon slx-ga">{{lang_password}} *</span> - <input tabindex="3" name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="{{lang_password}}"> + <input tabindex="4" name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="{{lang_password}}"> <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> </span--> </div> <div class="input-group"> <span class="input-group-addon slx-ga">{{lang_searchBase}}</span> - <input tabindex="4" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de"> + <input tabindex="5" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de"> <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> </span--> @@ -43,7 +47,7 @@ <br> <div class="input-group"> <span class="input-group-addon slx-ga">Home</span> - <input tabindex="4" name="home" value="{{home}}" type="text" class="form-control" placeholder="\\server.example.com\%s"> + <input tabindex="6" name="home" value="{{home}}" type="text" class="form-control" placeholder="\\server.example.com\%s"> <span class="input-group-btn"> <a class="btn btn-default" data-toggle="modal" data-target="#help-home"><span class="glyphicon glyphicon-question-sign"></span></a> </span> @@ -60,7 +64,10 @@ <div class="modal-header">{{lang_userDirectory}}</div> <div class="modal-body"> <p> - {{lang_userDirectoryInfo1}} <pre>\\fileserv.uni.example.com\users\%s</pre> + {{lang_userDirectoryInfo1}} + </p> + <pre>\\fileserv.uni.example.com\users\%s</pre> + <p> {{lang_userDirectoryInfo2}} </p> <p> diff --git a/templates/sysconfig/cfg-start.html b/templates/sysconfig/cfg-start.html index 44119dd3..6a810e5c 100644 --- a/templates/sysconfig/cfg-start.html +++ b/templates/sysconfig/cfg-start.html @@ -1,7 +1,7 @@ <form role="form" method="post" action="?do=SysConfig&action=addconfig&step={{step}}"> <input type="hidden" name="token" value="{{token}}"> <div class="input-group"> - <span class="input-group-addon">{{lang_name}}</span> + <span class="input-group-addon">{{lang_name}} *</span> <input type="text" name="title" class="form-control" placeholder="{{lang_configuration}}" autofocus="autofocus"> </div> <hr> diff --git a/templates/sysconfig/config-module-list.html b/templates/sysconfig/config-module-list.html new file mode 100644 index 00000000..6cd77f9e --- /dev/null +++ b/templates/sysconfig/config-module-list.html @@ -0,0 +1,17 @@ +<form method="post" action="?do=SysConfig"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="module"> + <table class="slx-table"> + {{#modules}} + <tr> + <td>{{module}}</td> + <td> + <button class="btn btn-default btn-xs" name="list" value="{{moduleid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button> + </td> + </tr> + {{/modules}} + </table> + {{^modules}} + <div class="alert alert-warning">{{lang_noContent}}</div> + {{/modules}} +</form>
\ No newline at end of file diff --git a/templates/systemstatus/_page.html b/templates/systemstatus/_page.html index 9c50bb93..d3ac1d06 100644 --- a/templates/systemstatus/_page.html +++ b/templates/systemstatus/_page.html @@ -1,80 +1,77 @@ -<div class="container"> - - {{#rebootTask}} - <div data-tm-id="{{rebootTask}}" data-tm-log="messages">Reboot...</div> - {{/rebootTask}} +{{#rebootTask}} +<div data-tm-id="{{rebootTask}}" data-tm-log="messages">Reboot...</div> +{{/rebootTask}} - <div class="row"> +<div class="row"> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_space}} - </div> - <div class="panel-body" id="diskstat"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_space}} + </div> + <div class="panel-body" id="diskstat"> + <span class="glyphicon glyphicon-refresh slx-rotation"></span> </div> </div> + </div> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_services}} - </div> - <div class="panel-body" id="services"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_services}} + </div> + <div class="panel-body" id="services"> + <span class="glyphicon glyphicon-refresh slx-rotation"></span> </div> </div> - </div> +</div> + - <div class="row"> +<div class="row"> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_addressConfiguration}} - </div> - <div class="panel-body" id="addresses"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_addressConfiguration}} + </div> + <div class="panel-body" id="addresses"> + <span class="glyphicon glyphicon-refresh slx-rotation"></span> </div> </div> + </div> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_system}} - </div> - <div class="panel-body" id="systeminfo"> - <span class="glyphicon glyphicon-refresh slx-rotation"></span> - </div> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_system}} + </div> + <div class="panel-body" id="systeminfo"> + <span class="glyphicon glyphicon-refresh slx-rotation"></span> </div> </div> - </div> - - <div class="row"> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_maintenance}} - </div> - <div class="panel-body"> - <form class="form-adduser" action="?do=SystemStatus" method="post"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="reboot"> - <div>Server Reboot</div> - <label><input type="checkbox" name="confirm" value="yep"> {{lang_iAmSure}}</label> - <button class="btn btn-warning btn-xs" type="submit">Reboot</button> - </form> - </div> - </div> +</div> +<div class="row"> + + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + {{lang_maintenance}} + </div> + <div class="panel-body"> + <form class="form-adduser" action="?do=SystemStatus" method="post"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="reboot"> + <div>Server Reboot</div> + <label><input type="checkbox" name="confirm" value="yep"> {{lang_iAmSure}}</label> + <button class="btn btn-warning btn-xs" type="submit">Reboot</button> + </form> + </div> + </div> </div> </div> diff --git a/templates/translation/_page.html b/templates/translation/_page.html index dee651a7..ed4e8c35 100644 --- a/templates/translation/_page.html +++ b/templates/translation/_page.html @@ -1,16 +1,14 @@ -<div class="container"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_langAdministration}} - </div> - <div class="panel-body"> - <p>{{lang_adminInfo}}</p> - <ul class="nav nav-pills nav-stacked"> - <li><a href="?do=Translation&page=templates">{{lang_editTemplates}}</a></li> - <li><a href="?do=Translation&page=messages">{{lang_editMessages}}</a></li> - <li><a href="?do=Translation&page=hardcoded">{{lang_editHardcoded}}</a></li> - <li><a href="?do=Translation&page=settings">{{lang_editSettings}}</a></li> - </ul> - </div> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_langAdministration}} + </div> + <div class="panel-body"> + <p>{{lang_adminInfo}}</p> + <ul class="nav nav-pills nav-stacked"> + <li><a href="?do=Translation&page=templates">{{lang_editTemplates}}</a></li> + <li><a href="?do=Translation&page=messages">{{lang_editMessages}}</a></li> + <li><a href="?do=Translation&page=hardcoded">{{lang_editHardcoded}}</a></li> + <li><a href="?do=Translation&page=settings">{{lang_editSettings}}</a></li> + </ul> </div> </div> diff --git a/templates/translation/template-list.html b/templates/translation/template-list.html index 1449cef0..881fc5af 100644 --- a/templates/translation/template-list.html +++ b/templates/translation/template-list.html @@ -1,31 +1,30 @@ -<div class="container"> - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_langAdministration}} - </div> - <div class="panel-body"> - <p>{{lang_adminInfo}}</p> - </div> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_langAdministration}} </div> - <div class="panel panel-default"> - <table class="table table-hover"> - <thead> - <tr> - <th>Template</th> - <th>{{lang_status}}</th> - <tr> - </thead> - <tbody> - {{#table}} - <tr onclick="goTo('{{link}}');"> - <td>{{template}}</td> - <td>{{{status}}}</td> - </tr> - {{/table}} - </tbody> - </table> + <div class="panel-body"> + <p>{{lang_adminInfo}}</p> </div> </div> +<div class="panel panel-default"> + <table class="table table-hover"> + <thead> + <tr> + <th>Template</th> + <th>{{lang_status}}</th> + <tr> + </thead> + <tbody> + {{#table}} + <tr onclick="goTo('{{link}}');"> + <td>{{template}}</td> + <td>{{{status}}}</td> + </tr> + {{/table}} + </tbody> + </table> +</div> + <script> function goTo(link){ window.location.href = "?do=Translation&page=template&template=" + link; diff --git a/templates/vmstore/mount.html b/templates/vmstore/mount.html index e1893e00..eabee81a 100644 --- a/templates/vmstore/mount.html +++ b/templates/vmstore/mount.html @@ -1,28 +1,25 @@ -<div class="container"> - - <div class="panel panel-default"> - <div class="panel-heading"> - {{lang_vmLocationConfiguration}} - </div> +<div class="panel panel-default"> + <div class="panel-heading"> + {{lang_vmLocationConfiguration}} + </div> - <div class="panel-body"> - <div data-tm-id="{{task}}" data-tm-log="messages" data-tm-callback="mountCb">{{lang_configure}}</div> + <div class="panel-body"> + <div data-tm-id="{{task}}" data-tm-log="messages" data-tm-callback="mountCb">{{lang_configure}}</div> - <br> - <div id="finish" class="pull-right" style="display:none"> - <a href="?do=VmStore" class="btn btn-primary">{{lang_back}}</a> - </div> - <script type="text/javascript"> - function mountCb(task) - { - if (!task || !task.statusCode) - return; - if (task.statusCode !== 'TASK_WAITING' && task.statusCode !== 'TASK_PROCESSING') { - $('#finish').attr('style', ''); - } + <br> + <div id="finish" class="pull-right" style="display:none"> + <a href="?do=VmStore" class="btn btn-primary">{{lang_back}}</a> + </div> + <script type="text/javascript"> + function mountCb(task) + { + if (!task || !task.statusCode) + return; + if (task.statusCode !== 'TASK_WAITING' && task.statusCode !== 'TASK_PROCESSING') { + $('#finish').attr('style', ''); } - </script> + } + </script> - </div> </div> -</div> +</div>
\ No newline at end of file |