diff options
| author | Simon Rettberg | 2014-05-28 18:18:34 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-05-28 18:18:34 +0200 |
| commit | e4e79982dd3c447a4ced762a6069db553e246f59 (patch) | |
| tree | d17f74565ed5347350edeab412a07c77bd80a636 /templates | |
| parent | WIP (diff) | |
| download | slx-admin-e4e79982dd3c447a4ced762a6069db553e246f59.tar.gz slx-admin-e4e79982dd3c447a4ced762a6069db553e246f59.tar.xz slx-admin-e4e79982dd3c447a4ced762a6069db553e246f59.zip | |
Fixed some bugs from Sateserver v05
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main-menu.html | 4 | ||||
| -rw-r--r-- | templates/minilinux/filelist.html | 2 | ||||
| -rw-r--r-- | templates/page-sysconfig-main.html | 7 | ||||
| -rw-r--r-- | templates/sysconfig/ad-checkconnection.html | 2 | ||||
| -rw-r--r-- | templates/sysconfig/cfg-start.html | 3 |
5 files changed, 14 insertions, 4 deletions
diff --git a/templates/main-menu.html b/templates/main-menu.html index 24ee2238..a419857c 100644 --- a/templates/main-menu.html +++ b/templates/main-menu.html @@ -17,9 +17,9 @@ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Einstellungen<b class="caret"></b></a> <ul class="dropdown-menu"> <li class="dropdown-header">Client</li> - <li><a href="?do=MiniLinux">MiniLinux</a></li> + <li><a href="?do=SysConfig">Lokalisierung</a></li> + <li><a href="?do=MiniLinux">bwLehrpool Mini-Linux</a></li> <li><a href="?do=BaseConfig">KonfigurationsVariablen</a></li> - <li><a href="?do=SysConfig">SystemKonfiguration</a></li> <li class="divider"></li> <li class="dropdown-header">Server</li> <li><a href="?do=ServerSetup">Grundkonfiguration</a></li> diff --git a/templates/minilinux/filelist.html b/templates/minilinux/filelist.html index 38b709f6..abb28aad 100644 --- a/templates/minilinux/filelist.html +++ b/templates/minilinux/filelist.html @@ -32,7 +32,7 @@ function slxUpdate(uid, id, name) var msg = "Fehler beim Abruf: "; $('#' + uid).html(msg + xhr.status + " " + xhr.statusText); } else { - setTimeout(tmInit, 50); + setTimeout(tmInit, 100); } }); } diff --git a/templates/page-sysconfig-main.html b/templates/page-sysconfig-main.html index 59cc29fb..b3606113 100644 --- a/templates/page-sysconfig-main.html +++ b/templates/page-sysconfig-main.html @@ -37,10 +37,15 @@ Keine Systemkonfigurationen gefunden. <br>Erstellen Sie eine neue Konfiguration aus den unten aufgeführten Konfigurationsmodulen. </div> + {{^modules}} + <div class="alert alert-danger"> + Bevor Sie eine Systemkonfiguration erstellen können, müssen Sie zunächst ein Konfigurationsmodul erzeugen. + </div> + {{/modules}} {{/configs}} </form> </div> - <div class="panel-footer"> + <div class="panel-footer"> <a class="btn btn-primary" href="?do=SysConfig&action=addconfig">Neue Konfiguration</a> </div> </div> diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html index 4455660c..3a2c7a42 100644 --- a/templates/sysconfig/ad-checkconnection.html +++ b/templates/sysconfig/ad-checkconnection.html @@ -13,6 +13,7 @@ <input name="searchbase" value="{{searchbase}}" type="hidden"> <input name="binddn" value="{{binddn}}" type="hidden"> <input name="bindpw" value="{{bindpw}}" type="hidden"> + <input name="home" value="{{home}}" type="hidden"> <button type="submit" class="btn btn-primary">« Zurück</button> </form> </div> @@ -23,6 +24,7 @@ <input name="searchbase" value="{{searchbase}}" type="hidden"> <input name="binddn" value="{{binddn}}" type="hidden"> <input name="bindpw" value="{{bindpw}}" type="hidden"> + <input name="home" value="{{home}}" type="hidden"> <button id="nextbutton" type="submit" class="btn btn-primary">Überspringen »</button> </form> </div> diff --git a/templates/sysconfig/cfg-start.html b/templates/sysconfig/cfg-start.html index dc8f1d11..7d092337 100644 --- a/templates/sysconfig/cfg-start.html +++ b/templates/sysconfig/cfg-start.html @@ -26,6 +26,9 @@ {{/missing}} </div> {{/modules}} + {{^modules}} + <a class="btn btn-primary btn-xs" href="?do=SysConfig&action=addmodule&step={{startClass}}">Neu..</a> + {{/modules}} </div> </div> {{/groups}} |