diff options
author | Simon Rettberg | 2014-11-19 19:46:19 +0100 |
---|---|---|
committer | Simon Rettberg | 2014-11-19 19:46:19 +0100 |
commit | 8434cd9505a9672743908076896e417eddc47693 (patch) | |
tree | b997f9bb147f0ce473704212b9840717a5033bb0 | |
parent | Added proxy server settings (diff) | |
download | slx-admin-8434cd9505a9672743908076896e417eddc47693.tar.gz slx-admin-8434cd9505a9672743908076896e417eddc47693.tar.xz slx-admin-8434cd9505a9672743908076896e417eddc47693.zip |
Several minor fixes
- Removed common share setting for now (until properly supported)
- Remove extra container div in message display
- Support multiline translation strings
- Add "next" button on top of file list when creating custom config module
-rw-r--r-- | inc/defaultdata.inc.php | 6 | ||||
-rw-r--r-- | inc/message.inc.php | 2 | ||||
-rw-r--r-- | modules/translation.inc.php | 2 | ||||
-rw-r--r-- | templates/sysconfig/custom-fileselect.html | 6 | ||||
-rw-r--r-- | templates/translation/edit.html | 48 |
5 files changed, 42 insertions, 22 deletions
diff --git a/inc/defaultdata.inc.php b/inc/defaultdata.inc.php index fd3b3d92..c31d4ae4 100644 --- a/inc/defaultdata.inc.php +++ b/inc/defaultdata.inc.php @@ -24,7 +24,7 @@ class DefaultData 2 => 20, // Internet access 3 => 100, // Timesync 4 => 10, // System config - 5 => 15, // Public Shared folder + //5 => 15, // Public Shared folder 6 => 20000, // Unassigned/no category ); foreach ($cats as $cat => $sort) { @@ -109,7 +109,7 @@ class DefaultData 'catid' => '2', 'defaultvalue' => 'socks5', 'permissions' => '2', - 'validator' => '' + 'validator' => 'list:socks4|socks5|http-connect|http-relay' ), array( 'setting' => 'SLX_REMOTE_LOG_SESSIONS', @@ -139,6 +139,7 @@ class DefaultData 'permissions' => '2', 'validator' => 'regex:/^\d*$/' ), + /* array( 'setting' => 'SLX_COMMON_SHARE_PATH', 'catid' => '5', @@ -153,6 +154,7 @@ class DefaultData 'permissions' => '2', 'validator' => 'list:guest|user' ), + */ array( 'setting' => 'SLX_BENCHMARK_VM', 'catid' => '6', diff --git a/inc/message.inc.php b/inc/message.inc.php index 0e054846..2fccb0a0 100644 --- a/inc/message.inc.php +++ b/inc/message.inc.php @@ -65,7 +65,6 @@ class Message return; } // Non-Ajax - if (!self::$flushed) Render::openTag('div', array('class' => 'container')); foreach (self::$list as $item) { $message = Dictionary::getMessage($item['id']); foreach ($item['params'] as $index => $text) { @@ -74,7 +73,6 @@ class Message Render::addTemplate('messagebox-' . $item['type'], array('message' => $message)); self::$alreadyDisplayed[] = $item; } - if (!self::$flushed) Render::closeTag('div'); self::$list = array(); self::$flushed = true; } diff --git a/modules/translation.inc.php b/modules/translation.inc.php index c10facb2..85524d92 100644 --- a/modules/translation.inc.php +++ b/modules/translation.inc.php @@ -324,6 +324,8 @@ class Page_Translation extends Page foreach ($jsonTags as $tag => $translation) { $tags[$tag]['langs'][$lang]['translation'] = $translation; $tags[$tag]['langs'][$lang]['lang'] = $lang; + if (strpos($translation, "\n") !== false) + $tags[$tag]['langs'][$lang]['big'] = true; $tags[$tag]['tag'] = $tag; if (!isset($tags[$tag]['missing'])) $tags[$tag]['missing'] = 0; diff --git a/templates/sysconfig/custom-fileselect.html b/templates/sysconfig/custom-fileselect.html index de99c2f9..0c2d88e9 100644 --- a/templates/sysconfig/custom-fileselect.html +++ b/templates/sysconfig/custom-fileselect.html @@ -5,7 +5,11 @@ <span class="input-group-addon">{{lang_moduleName}}</span> <input type="text" name="title" class="form-control" placeholder="Mein Konfigurationsmodul" autofocus="autofocus"> </div> - <hr> + <div class="pull-right"> + <button type="submit" class="btn btn-primary">{{lang_next}} »</button> + </div> + <div class="clearfix"></div> + <hr> <p>{{lang_checkFileContent}}</p> <table class="table table-bordered table-condensed"> {{#files}} diff --git a/templates/translation/edit.html b/templates/translation/edit.html index 5fd2ef19..dc01deb6 100644 --- a/templates/translation/edit.html +++ b/templates/translation/edit.html @@ -19,24 +19,29 @@ <tr> <th>Mustache Tag</th> {{#langs}} - <th>{{lang}}</th> + <th>{{name}}</th> {{/langs}} <th></th> </tr> </thead> <tbody> {{#tags}} - <tr class="{{class}}" id="{{tag}}"> - <td>{{tag}}</td> - {{#langs}} - <td> - <input type="text" class="form-control" placeholder="{{placeholder}}" value="{{translation}}" name="lang#{{lang}}#{{tag}}"> - </td> - {{/langs}} - <td> - <button type="submit" class="btn btn-danger btn-xs" name="delete" value="{{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</button> - </td> - </tr> + <tr class="{{class}}" id="{{tag}}"> + <td>{{tag}}</td> + {{#langs}} + <td> + {{^big}} + <input type="text" class="form-control switchable" value="{{translation}}" ondblclick="mb(this)" name="lang#{{lang}}#{{tag}}"> + {{/big}} + {{#big}} + <textarea rows="3" class="form-control" name="lang#{{lang}}#{{tag}}">{{translation}}</textarea> + {{/big}} + </td> + {{/langs}} + <td> + <button type="submit" class="btn btn-danger btn-xs" name="delete" value="{{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</button> + </td> + </tr> {{/tags}} <tr id="newTag"> </tr> @@ -49,9 +54,18 @@ </div> </div> </div> -<script> -function addTag(){ - var target = document.getElementById('newTag'); - target.innerHTML = "<td> <input type='text' class='form-control' placeholder='{{lang_newTAG}}' name='newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_germanTAG}}' name='lang#de#newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_englishTAG}}' name='lang#en#newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_portugueseTAG}}' name='lang#pt#newtag'> </td><td></td>"; -} +<script type="text/javascript"> + function addTag() + { + var target = document.getElementById('newTag'); + target.innerHTML = "<td> <input type='text' class='form-control' placeholder='{{lang_newTAG}}' name='newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_germanTAG}}' name='lang#de#newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_englishTAG}}' name='lang#en#newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_portugueseTAG}}' name='lang#pt#newtag'> </td><td></td>"; + } + + function mb(el) + { + var old = $(el); + var ta = $('<textarea name="' + el.name + '" class="form-control" rows="3"></textarea>'); + ta.val(old.val()); + old.replaceWith(ta); + } </script> |