diff options
Diffstat (limited to 'modules-available/sysconfig/templates')
17 files changed, 119 insertions, 66 deletions
diff --git a/modules-available/sysconfig/templates/ad-selfsearch.html b/modules-available/sysconfig/templates/ad-selfsearch.html index e6a19468..0eefc372 100644 --- a/modules-available/sysconfig/templates/ad-selfsearch.html +++ b/modules-available/sysconfig/templates/ad-selfsearch.html @@ -42,7 +42,6 @@ {{#mapping}} <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <button type="submit" class="btn btn-primary">« {{lang_back}}</button> </form> @@ -67,7 +66,6 @@ {{#mapping}} <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <input name="fingerprint" value="{{fingerprint}}" type="hidden"> <button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_skip}} »</button> diff --git a/modules-available/sysconfig/templates/ad-start.html b/modules-available/sysconfig/templates/ad-start.html index 933859fd..6dd6208a 100644 --- a/modules-available/sysconfig/templates/ad-start.html +++ b/modules-available/sysconfig/templates/ad-start.html @@ -21,7 +21,7 @@ <input type="hidden" name="edit" value="{{edit}}"> <div class="input-group"> <span class="input-group-addon slx-ga2">{{lang_moduleTitle}}</span> - <input tabindex="1" name="title" value="{{title}}" type="text" class="form-control" autofocus> + <input tabindex="1" name="title" value="{{title}}" type="text" class="form-control" autofocus required> </div> <div class="input-group"> <span class="input-group-addon slx-ga2">Server *</span> @@ -77,16 +77,6 @@ <br> <div> <div class="checkbox"> - <input id="num-cb" type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}> - <label for="num-cb"><b>{{lang_fixNumeric}}</b></label> - </div> - <div> - <i>{{lang_fixNumericDescription}}</i> - </div> - </div> - <br> - <div> - <div class="checkbox"> <input id="ssl-cb" type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}> <label for="ssl-cb"><b>{{lang_ssl}}</b></label> </div> diff --git a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html index e686c29f..ced65650 100644 --- a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html +++ b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html @@ -30,7 +30,6 @@ <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <button type="submit" class="btn btn-primary">« {{lang_back}}</button> </form> @@ -55,7 +54,6 @@ {{#mapping}} <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <input name="originalbinddn" value="{{binddn}}" type="hidden"> <button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_next}} »</button> diff --git a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html index d698d994..b560eecd 100644 --- a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html +++ b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html @@ -25,7 +25,6 @@ {{#mapping}} <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <button type="submit" class="btn btn-primary">« {{lang_back}}</button> </form> @@ -49,13 +48,13 @@ {{#mapping}} <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <input name="fingerprint" value="{{fingerprint}}" type="hidden"> <input name="originalbinddn" value="{{binddn}}" type="hidden"> <button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_skip}} »</button> </form> </div> +<div class="clearfix"></div> <script type="text/javascript"> function ldapCb(task) { diff --git a/modules-available/sysconfig/templates/ad_ldap-homedir.html b/modules-available/sysconfig/templates/ad_ldap-homedir.html index 8a6c10de..33f55c16 100644 --- a/modules-available/sysconfig/templates/ad_ldap-homedir.html +++ b/modules-available/sysconfig/templates/ad_ldap-homedir.html @@ -17,7 +17,6 @@ {{#mapping}} <input type="hidden" name="mapping[{{field}}]" value="{{value}}"> {{/mapping}} - <input name="fixnumeric" value="{{fixnumeric}}" type="hidden"> <input name="genuid" value="{{genuid}}" type="hidden"> <input name="fingerprint" value="{{fingerprint}}" type="hidden"> diff --git a/modules-available/sysconfig/templates/branding-check.html b/modules-available/sysconfig/templates/branding-check.html index d48f9631..80eb4d48 100644 --- a/modules-available/sysconfig/templates/branding-check.html +++ b/modules-available/sysconfig/templates/branding-check.html @@ -20,7 +20,7 @@ <input type="hidden" name="edit" value="{{edit}}"> <div class="form-group"> <label for="title-id">{{lang_title}}</label> - <input type="text" name="title" value="{{title}}" id ="title-id" class="form-control" placeholder="Name des Moduls"> + <input type="text" name="title" value="{{title}}" id ="title-id" class="form-control" placeholder="Name des Moduls" required> </div> <div class="btn-group"> <a class="btn btn-default" href="?do=SysConfig&action=addmodule&step=Branding_Start">{{lang_cancel}}</a> diff --git a/modules-available/sysconfig/templates/branding-start.html b/modules-available/sysconfig/templates/branding-start.html index 0db085d9..a6346552 100644 --- a/modules-available/sysconfig/templates/branding-start.html +++ b/modules-available/sysconfig/templates/branding-start.html @@ -14,7 +14,7 @@ <input type="text" class="form-control" readonly placeholder="{{lang_selectFile}}"> <span class="input-group-btn"> <span class="btn btn-default btn-file"> - {{lang_browseForFile}}… <input type="file" name="file" id="input-file"> + {{lang_browseForFile}}… <input type="file" accept="image/svg+xml" name="file" id="input-file"> </span> </span> </div> diff --git a/modules-available/sysconfig/templates/cfg-start.html b/modules-available/sysconfig/templates/cfg-start.html index b4628cba..018cf89f 100644 --- a/modules-available/sysconfig/templates/cfg-start.html +++ b/modules-available/sysconfig/templates/cfg-start.html @@ -3,7 +3,7 @@ <input type="hidden" name="edit" value="{{edit}}"> <div class="input-group"> <span class="input-group-addon">{{lang_name}} *</span> - <input type="text" name="title" value="{{title}}" class="form-control" placeholder="{{lang_configuration}}" autofocus="autofocus"> + <input type="text" name="title" value="{{title}}" class="form-control" placeholder="{{lang_configuration}}" autofocus="autofocus" required> </div> <hr> <p>{{lang_configurationChoose}}</p> diff --git a/modules-available/sysconfig/templates/custom-filelist.html b/modules-available/sysconfig/templates/custom-filelist.html index 344eece3..20cedfda 100644 --- a/modules-available/sysconfig/templates/custom-filelist.html +++ b/modules-available/sysconfig/templates/custom-filelist.html @@ -4,11 +4,23 @@ {{#files}} <tr> {{#isdir}} - <td class="fileEntry slx-bold" colspan="2">{{name}}</td> + <td class="fileEntry slx-bold" colspan="4">{{name}}</td> {{/isdir}} {{^isdir}} - <td class="fileEntry">{{name}}</td> - <td>{{size}}</td> + <td class="fileEntry"> + {{name}} + {{#linkTarget}} + -> + <span class="text-nowrap">{{linkTarget}}</span> + {{/linkTarget}} + </td> + <td class="text-nowrap">{{user}}{{#user}}{{#group}}/{{/group}}{{/user}}{{group}}</td> + <td class="text-nowrap">{{userId}}:{{groupId}}</td> + <td class="text-nowrap"> + {{^linkTarget}} + {{size}} + {{/linkTarget}} + </td> {{/isdir}} </tr> {{/files}} diff --git a/modules-available/sysconfig/templates/custom-fileselect.html b/modules-available/sysconfig/templates/custom-fileselect.html index f14a6fde..5f190f08 100644 --- a/modules-available/sysconfig/templates/custom-fileselect.html +++ b/modules-available/sysconfig/templates/custom-fileselect.html @@ -4,7 +4,8 @@ <input type="hidden" name="edit" value="{{edit}}"> <div class="input-group"> <span class="input-group-addon">{{lang_moduleName}}</span> - <input type="text" name="title" value="{{title}}" class="form-control" placeholder="Mein Konfigurationsmodul" autofocus="autofocus"> + <input type="text" name="title" value="{{title}}" class="form-control" placeholder="Mein Konfigurationsmodul" + autofocus="autofocus" required> </div> <div class="pull-right"> <button type="submit" class="btn btn-primary">{{lang_next}} »</button> @@ -12,20 +13,43 @@ <div class="clearfix"></div> <hr> <p>{{lang_checkFileContent}}</p> + {{#userGroupWarn}} + <div class="alert alert-warning"> + {{lang_moduleOwnerWarn}} + </div> + <div class="checkbox"> + <input id="force-owner" type="checkbox" name="force-owner" value="1" checked> + <label for="force-owner">{{lang_forceRootOwner}}</label> + </div> + <div class="slx-space"></div> + {{/userGroupWarn}} <table class="table table-bordered table-condensed"> - {{#files}} + {{#files}} <tr> {{#isdir}} - <td class="fileEntry slx-bold" colspan="2">{{name}}</td> + <td class="fileEntry slx-bold" colspan="4">{{name}}</td> {{/isdir}} {{^isdir}} - <td class="fileEntry">{{name}}</td> - <td>{{size}}</td> + <td class="fileEntry"> + {{name}} + {{#linkTarget}} + -> + <span class="text-nowrap">{{linkTarget}}</span> + {{/linkTarget}} + </td> + <td class="text-nowrap">{{user}}{{#user}}{{#group}}/{{/group}}{{/user}}{{group}}</td> + <td class="text-nowrap">{{userId}}:{{groupId}}</td> + <td class="text-nowrap"> + {{^linkTarget}} + {{size}} + {{/linkTarget}} + </td> {{/isdir}} </tr> - {{/files}} + {{/files}} </table> <div class="pull-right"> <button type="submit" class="btn btn-primary">{{lang_next}} »</button> </div> + <div class="clearfix"></div> </form> diff --git a/modules-available/sysconfig/templates/ldap-finish.html b/modules-available/sysconfig/templates/ldap-finish.html index a735e792..bd998bfd 100644 --- a/modules-available/sysconfig/templates/ldap-finish.html +++ b/modules-available/sysconfig/templates/ldap-finish.html @@ -12,6 +12,7 @@ <div id="finish" class="pull-right" style="display:none"> <a href="?do=SysConfig" class="btn btn-primary">{{lang_toSystemConfiguration}}</a> </div> +<div class="clearfix"></div> <script type="text/javascript"> function ldapCb(task) { diff --git a/modules-available/sysconfig/templates/ldap-start.html b/modules-available/sysconfig/templates/ldap-start.html index 28019d9e..e6c98680 100644 --- a/modules-available/sysconfig/templates/ldap-start.html +++ b/modules-available/sysconfig/templates/ldap-start.html @@ -11,7 +11,7 @@ <input type="hidden" name="edit" value="{{edit}}"> <div class="input-group"> <span class="input-group-addon slx-ga2">{{lang_moduleTitle}}</span> - <input tabindex="1" name="title" value="{{title}}" type="text" class="form-control"> + <input tabindex="1" name="title" value="{{title}}" type="text" class="form-control" required> </div> <div class="input-group"> <span class="input-group-addon slx-ga2">Server *</span> @@ -78,16 +78,6 @@ <br> <div> <div class="checkbox"> - <input id="num-cb" type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}> - <label for="num-cb"><b>{{lang_fixNumeric}}</b></label> - </div> - <div> - <i>{{lang_fixNumericDescription}}</i> - </div> - </div> - <br> - <div> - <div class="checkbox"> <input id="ssl-cb" type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}> <label for="ssl-cb"><b>{{lang_ssl}}</b></label> </div> diff --git a/modules-available/sysconfig/templates/list-configs.html b/modules-available/sysconfig/templates/list-configs.html index 83feeaa6..1370155f 100644 --- a/modules-available/sysconfig/templates/list-configs.html +++ b/modules-available/sysconfig/templates/list-configs.html @@ -20,11 +20,17 @@ <input type="hidden" name="locationid" value="{{locationid}}"> <table id="conftable" class="slx-table table-hover" style="width:100%"> {{#configs}} - <tr> - <td data-id="{{configid}}" data-modlist="{{modlist}}" class="confrow slx-pointer" width="100%" title="{{dateline_s}}"> - <table class="slx-ellipsis"><tr><td>{{config}}</td></tr></table> + <tr data-id="{{configid}}" data-modlist="{{modlist}}" class="confrow"> + <td class="title slx-pointer" width="100%" title="{{dateline_s}}"> + <table class="slx-ellipsis"><tr><td> + <button type="button" class="btn btn-xs btn-default btn-warnings {{warnings_hidden}}" data-confirm="#confirm-mod-{{configid}}"> + <span class="glyphicon glyphicon-exclamation-sign text-danger"></span> + </button> + {{config}} + </td></tr></table> </td> <td> + <pre id="confirm-mod-{{configid}}" class="hidden row-warnings">{{warnings}}</pre> {{^current}} <button class="btn btn-primary btn-xs" name="activate" value="{{configid}}" {{perms.config.assign.disabled}}> <span class="glyphicon glyphicon-flag"></span> @@ -49,10 +55,10 @@ {{^locationid}} <button {{#needrebuild}} - class="refconf btn btn-primary btn-xs" + class="btn-rebuild btn btn-primary btn-xs" {{/needrebuild}} {{^needrebuild}} - class="refconf btn btn-default btn-xs" + class="btn-rebuild btn btn-default btn-xs" {{/needrebuild}} name="rebuild" value="{{configid}}" title="{{lang_rebuild}}" {{perms.config.edit.disabled}}> diff --git a/modules-available/sysconfig/templates/list-legend.html b/modules-available/sysconfig/templates/list-legend.html index 809a0449..49974a5f 100644 --- a/modules-available/sysconfig/templates/list-legend.html +++ b/modules-available/sysconfig/templates/list-legend.html @@ -25,6 +25,10 @@ <span class="btn btn-danger btn-xs" title="{{lang_delete}}"><span class="glyphicon glyphicon-trash"></span></span> {{lang_deleteLong}} </p> + <p> + <span class="glyphicon glyphicon-question-sign" title="{{lang_moduleUnused}}"></span> + {{lang_moduleUnusedLong}} + </p> {{#showLocationBadge}} <p> <span class="badge">+4</span> diff --git a/modules-available/sysconfig/templates/list-modules.html b/modules-available/sysconfig/templates/list-modules.html index b8783c59..5bd19446 100644 --- a/modules-available/sysconfig/templates/list-modules.html +++ b/modules-available/sysconfig/templates/list-modules.html @@ -10,10 +10,13 @@ <input type="hidden" name="action" value="module"> <table id="modtable" class="slx-table table-hover" style="width:100%"> {{#modules}} - <tr> + <tr data-id="{{id}}" class="modrow"> <td class="badge text-nowrap">{{moduleType}}</td> - <td data-id="{{id}}" class="modrow slx-pointer" width="100%" title="{{lang_lastEdited}} {{dateline_s}}"> - <table class="slx-ellipsis"><tr><td>{{title}}</td></tr></table> + <td class="title slx-pointer" width="100%" title="{{lang_lastEdited}} {{dateline_s}}"> + <table class="slx-ellipsis"><tr><td> + <span class="glyphicon glyphicon-question-sign pull-right icon-unused hidden" title="{{lang_moduleUnused}}"></span> + {{title}} + </td></tr></table> </td> <td class="text-nowrap"> {{#allowDownload}} @@ -27,10 +30,10 @@ <td class="text-nowrap"> <button {{#needRebuild}} - class="refmod btn btn-primary btn-xs" + class="btn-rebuild btn btn-primary btn-xs" {{/needRebuild}} {{^needRebuild}} - class="refmod btn btn-default btn-xs" + class="btn-rebuild btn btn-default btn-xs" {{/needRebuild}} name="rebuild" value="{{id}}" title="{{lang_rebuild}}" {{perms.module.edit.disabled}}> <span class="glyphicon glyphicon-refresh"></span> diff --git a/modules-available/sysconfig/templates/sshconfig-start.html b/modules-available/sysconfig/templates/sshconfig-start.html index 33108161..b56be415 100644 --- a/modules-available/sysconfig/templates/sshconfig-start.html +++ b/modules-available/sysconfig/templates/sshconfig-start.html @@ -3,35 +3,43 @@ <input type="hidden" name="edit" value="{{edit}}"> <div class="input-group"> <span class="input-group-addon">{{lang_moduleName}}</span> - <input type="text" name="title" value="{{title}}" class="form-control" autofocus="autofocus"> + <input type="text" name="title" value="{{title}}" class="form-control" autofocus="autofocus" required> </div> + <br> <div class="form-group"> - <div class="checkbox"> - <input type="checkbox" name="allowPasswordLogin" value="yes" {{#apl}}checked{{/apl}}> - <label><b>{{lang_allowPass}}</b></label> - </div> + <label>{{lang_sshAllowedUsers}} + <select class="form-control" name="allowedUsersLogin"> + <option value="ROOT_ONLY" {{USR_ROOT_ONLY_selected}}>{{lang_user_root_only}}</option> + <option value="USER_ONLY" {{USR_USER_ONLY_selected}}>{{lang_user_user_only}}</option> + <option value="ALL" {{USR_ALL_selected}}>{{lang_user_all}}</option> + </select> + </label> <div> - <i>{{lang_allowPassInfo}}</i> + <i>{{lang_sshAllowedUsersInfo}}</i> </div> </div> <div class="form-group"> - <label for="root-key">{{lang_rootKey}}</label> - <input class="form-control" type="text" name="publicKey" value="{{publicKey}}" id="root-key" pattern="[a-z0-9\-]+ +[a-zA-Z0-9=/\+]+ +.*"> - <i>{{lang_rootKeyInfo}}</i> + <label>{{lang_sshAllowPass}} + <select class="form-control" name="allowPasswordLogin"> + <option value="NO" {{PWD_NO_selected}}>{{lang_no}}</option> + <option value="USER_ONLY" {{PWD_USER_ONLY_selected}}>{{lang_pwlogin_user_only}}</option> + <option value="YES" {{PWD_YES_selected}}>{{lang_yes}}</option> + </select> + </label> + <div> + <i>{{lang_sshAllowPassInfo}}</i> + </div> </div> <div class="form-group"> <label for="port">{{lang_listenPort}}</label> <input class="form-control" type="text" name="listenPort" value="{{listenPort}}" id="port" pattern="\d+" placeholder="22"> <i>{{lang_listenPortInfo}}</i> </div> - <p> - <i> - {{lang_sshMultipleHeadsup}} - </i> - </p> + <div class="btn-group"> + <a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a> + </div> <div class="btn-group pull-right"> <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> </div> <div class="clearfix"></div> </form> - diff --git a/modules-available/sysconfig/templates/sshkey-start.html b/modules-available/sysconfig/templates/sshkey-start.html new file mode 100644 index 00000000..8033740c --- /dev/null +++ b/modules-available/sysconfig/templates/sshkey-start.html @@ -0,0 +1,21 @@ +<form role="form" enctype="multipart/form-data" method="post" action="?do=SysConfig&action=addmodule&step={{step}}"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="edit" value="{{edit}}"> + <div class="input-group"> + <span class="input-group-addon">{{lang_moduleName}}</span> + <input type="text" name="title" value="{{title}}" class="form-control" autofocus="autofocus" required> + </div> + <div class="form-group"> + <label for="root-key">{{lang_rootKey}}</label> + <input class="form-control" type="text" name="publicKey" value="{{publicKey}}" id="root-key" required pattern="[a-z0-9\-]+ +[a-zA-Z0-9=/\+]+ +.*"> + <i>{{lang_rootKeyInfo}}</i> + </div> + <div class="btn-group"> + <a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a> + </div> + <div class="btn-group pull-right"> + <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> + </div> + <div class="clearfix"></div> +</form> + |