diff options
| author | Christian Hofmaier | 2017-09-11 13:25:34 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-09-11 13:25:34 +0200 |
| commit | 4246ee9ecdc5d9bfc55c67533c17617c9f37ec3f (patch) | |
| tree | 4ab2ffbd1483265e061ad80094630d472f870c67 | |
| parent | [news] made tables sortable by date (diff) | |
| download | slx-admin-4246ee9ecdc5d9bfc55c67533c17617c9f37ec3f.tar.gz slx-admin-4246ee9ecdc5d9bfc55c67533c17617c9f37ec3f.tar.xz slx-admin-4246ee9ecdc5d9bfc55c67533c17617c9f37ec3f.zip | |
[internetaccess] fixed inconsistencies
| -rw-r--r-- | modules-available/internetaccess/lang/en/template-tags.json | 2 | ||||
| -rw-r--r-- | modules-available/internetaccess/templates/_page.html | 60 | ||||
| -rw-r--r-- | modules-available/news/templates/page-news.html | 1 |
3 files changed, 30 insertions, 33 deletions
diff --git a/modules-available/internetaccess/lang/en/template-tags.json b/modules-available/internetaccess/lang/en/template-tags.json index 1be62f43..2ac50527 100644 --- a/modules-available/internetaccess/lang/en/template-tags.json +++ b/modules-available/internetaccess/lang/en/template-tags.json @@ -1,7 +1,7 @@ { "lang_automatic": "Auto", "lang_description": "Here you can configure how the satellite server has to access the internet.", - "lang_internetAccess": "Internet access", + "lang_internetAccess": "Internet Access", "lang_manual": "Manual", "lang_manualProxyConfig": "If you want to configure a proxy server manually, please supply the credentials here.", "lang_no": "None", diff --git a/modules-available/internetaccess/templates/_page.html b/modules-available/internetaccess/templates/_page.html index ac82325c..7b1584ee 100644 --- a/modules-available/internetaccess/templates/_page.html +++ b/modules-available/internetaccess/templates/_page.html @@ -4,37 +4,33 @@ <input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="position:absolute;top:-2000px" tabindex="-1"> <input type="password" name="password_fake" id="password_fake" value="" style="position:absolute;top:-2000px" tabindex="-1"> <input type="hidden" name="token" value="{{token}}"> - <div class="panel panel-default"> - <div class="panel-heading">{{lang_internetAccess}}</div> - <div class="panel-body"> - <p>{{lang_description}}</p> - <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_proxyType}}</span> - <select name="PROXY_CONF" class="form-control"> - <option value="AUTO" {{selected_AUTO}}>{{lang_automatic}} (dns-wpad)</option> - <option value="NO" {{selected_NO}}>{{lang_no}}</option> - <option value="YES" {{selected_YES}}>{{lang_manual}}</option> - </select> - </div> - <br> - <p>{{lang_manualProxyConfig}}</p> - <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_proxyAddress}} *</span> - <input name="PROXY_ADDR" value="{{PROXY_ADDR}}" type="text" class="form-control"> - </div> - <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_proxyPort}} *</span> - <input name="PROXY_PORT" value="{{PROXY_PORT}}" type="text" class="form-control"> - </div> - <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_proxyUsername}}</span> - <input name="PROXY_USERNAME" value="{{PROXY_USERNAME}}" type="text" class="form-control"> - </div> - <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_proxyPassword}}</span> - <input name="PROXY_PASSWORD" value="{{PROXY_PASSWORD}}" type="{{password_type}}" class="form-control"> - </div> - <button class="btn btn-primary" type="submit">{{lang_save}}</button> - </div> + <p>{{lang_description}}</p> + <div class="input-group"> + <span class="input-group-addon">{{lang_proxyType}}</span> + <select name="PROXY_CONF" class="form-control"> + <option value="AUTO" {{selected_AUTO}}>{{lang_automatic}} (dns-wpad)</option> + <option value="NO" {{selected_NO}}>{{lang_no}}</option> + <option value="YES" {{selected_YES}}>{{lang_manual}}</option> + </select> </div> + <br> + <p>{{lang_manualProxyConfig}}</p> + <div class="input-group"> + <span class="input-group-addon">{{lang_proxyAddress}} *</span> + <input name="PROXY_ADDR" value="{{PROXY_ADDR}}" type="text" class="form-control"> + </div> + <div class="input-group"> + <span class="input-group-addon">{{lang_proxyPort}} *</span> + <input name="PROXY_PORT" value="{{PROXY_PORT}}" type="text" class="form-control"> + </div> + <div class="input-group"> + <span class="input-group-addon">{{lang_proxyUsername}}</span> + <input name="PROXY_USERNAME" value="{{PROXY_USERNAME}}" type="text" class="form-control"> + </div> + <div class="input-group"> + <span class="input-group-addon">{{lang_proxyPassword}}</span> + <input name="PROXY_PASSWORD" value="{{PROXY_PASSWORD}}" type="{{password_type}}" class="form-control"> + </div> + <br/> + <button class="btn btn-primary pull-right" type="submit">{{lang_save}}</button> </form> diff --git a/modules-available/news/templates/page-news.html b/modules-available/news/templates/page-news.html index b30faa55..494d356b 100644 --- a/modules-available/news/templates/page-news.html +++ b/modules-available/news/templates/page-news.html @@ -61,6 +61,7 @@ <div role="tabpanel" class="tab-pane {{#editHelp}}active{{/editHelp}}" id="help"> <form class="bottom-margin-50" action="?do=News&action=save" method="post"> <div class="form-group"> + <br/> <label for="news-content-id">{{lang_content}}</label> <textarea name="help-content" id="help-content-id" class="form-control summernote" style="min-height:400px" placeholder="">{{latestHelp}}</textarea> </div> |