diff options
| author | Jonathan Bauer | 2014-06-04 18:11:24 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-06-04 18:11:24 +0200 |
| commit | 9f14e302af77b5a8f72b4785e7376cc346519ef7 (patch) | |
| tree | aa3be844d8b879b3eab06793c4ae33ac0e6c233b /templates | |
| parent | listing of module's content (diff) | |
| parent | Add RO-Credentials to CIFS VMStore (diff) | |
| download | slx-admin-9f14e302af77b5a8f72b4785e7376cc346519ef7.tar.gz slx-admin-9f14e302af77b5a8f72b4785e7376cc346519ef7.tar.xz slx-admin-9f14e302af77b5a8f72b4785e7376cc346519ef7.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/exec-error.html | 1 | ||||
| -rw-r--r-- | templates/exec-progress.html | 4 | ||||
| -rw-r--r-- | templates/helloworld.html | 5 | ||||
| -rw-r--r-- | templates/minilinux/filelist.html | 5 | ||||
| -rw-r--r-- | templates/page-vmstore.html | 32 |
5 files changed, 22 insertions, 25 deletions
diff --git a/templates/exec-error.html b/templates/exec-error.html deleted file mode 100644 index 0a82e1df..00000000 --- a/templates/exec-error.html +++ /dev/null @@ -1 +0,0 @@ -<div class="alert alert-danger"><p>Ausführung fehlgeschlagen!</p>{{error}}</div> diff --git a/templates/exec-progress.html b/templates/exec-progress.html deleted file mode 100644 index 0583a74a..00000000 --- a/templates/exec-progress.html +++ /dev/null @@ -1,4 +0,0 @@ -<div class="well well-sm"> - <pre>{{text}}</pre> - {{#running}}<script> setTimeout(function() { $('#{{id}}').load('api.php?do=exec&progress={{progress}}&id={{id}}&pid={{pid}}'); }, 2000); // </script>{{/running}} -</div> diff --git a/templates/helloworld.html b/templates/helloworld.html deleted file mode 100644 index 752f1e83..00000000 --- a/templates/helloworld.html +++ /dev/null @@ -1,5 +0,0 @@ -<div> - Hello World!<br /> - Variable wurst set to {{wurst}} -</div> - diff --git a/templates/minilinux/filelist.html b/templates/minilinux/filelist.html index abb28aad..fdc3f14e 100644 --- a/templates/minilinux/filelist.html +++ b/templates/minilinux/filelist.html @@ -10,7 +10,9 @@ {{#files}} <li class="list-group-item" id="{{uid}}"> {{name}} - {{#changed}}<span class="btn btn-primary btn-sm" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')">Aktualisieren</span>{{/changed}} + {{#changed}}<span class="btn btn-success btn-sm" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')">Aktualisieren</span>{{/changed}} + {{^changed}}<span class="btn btn-default btn-sm" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')">Erneut herunterladen</span>{{/changed}} + {{{download}}} </li> {{/files}} </ul> @@ -36,4 +38,5 @@ function slxUpdate(uid, id, name) } }); } +tmInit(); </script>
\ No newline at end of file diff --git a/templates/page-vmstore.html b/templates/page-vmstore.html index 8732276f..1dde2734 100644 --- a/templates/page-vmstore.html +++ b/templates/page-vmstore.html @@ -6,7 +6,7 @@ <div class="panel-heading"> VM Speicherort <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"> + <div class="panel-body slx-md-width"> <p>Bitte wählen Sie, wo die Images der Virtuellen Maschinen gespeichert werden sollen.</p> <div class="panel panel-default"> <div class="panel-heading"> @@ -21,12 +21,8 @@ <input type="radio" name="storetype" value="nfs" {{pre-nfs}}> NFS </div> <div class="panel-body"> - <div class="input-group"> - <span class="input-group-addon slx-ga"> - NFS-Export - </span> - <input type="text" class="form-control" name="nfsaddr" value="{{nfsaddr}}" placeholder="1.2.3.4:/export/bwlp"> - </div> + <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"> @@ -34,23 +30,31 @@ <input type="radio" name="storetype" value="cifs" {{pre-cifs}}> CIFS </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">Lese/Schreib-Zugangsdaten</label> <div class="input-group"> <span class="input-group-addon slx-ga"> - UNC-Pfad + Benutzername + </span> + <input type="text" class="form-control" name="cifsuser" value="{{cifsuser}}" placeholder="Benutzername" id="cifsuser"> + <span class="input-group-addon"> + Passwort </span> - <input type="text" class="form-control" name="cifsaddr" value="{{cifsaddr}}" placeholder="\\samba.server.example.com\bwlp"> + <input type="text" class="form-control" name="cifspasswd" value="{{cifspasswd}}" placeholder="Passwort"> </div> + <br> + <label for="cifsuserro">Nur-Lese-Zugangsdaten</label> <div class="input-group"> <span class="input-group-addon slx-ga"> Benutzername </span> - <input type="text" class="form-control" name="cifsuser" value="{{cifsuser}}" placeholder="Benutzername"> - </div> - <div class="input-group"> - <span class="input-group-addon slx-ga"> + <input type="text" class="form-control" name="cifsuserro" value="{{cifsuserro}}" placeholder="Benutzername" id="cifsuserro"> + <span class="input-group-addon"> Passwort </span> - <input type="text" class="form-control" name="cifspasswd" value="{{cifspasswd}}" placeholder="Passwort"> + <input type="text" class="form-control" name="cifspasswdro" value="{{cifspasswdro}}" placeholder="Passwort"> </div> </div> </div> |