commit a3e8def812ba2e0e44cbf93b05fcd528a578a2db parent 7ca447441d1173bf1d01edd5e0a7ff7a4da9fb03 Author: Jan Dankert <develop@jandankert.de> Date: Sun, 28 Apr 2019 04:34:42 +0200 Fix: Default-Wert für Benutzerstil wird bereits beim Laden aus der Datenbank festgelegt. Hier ist das falsch gewesen. Diffstat:
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/modules/cms-ui/themes/default/html/views/profile/edit.php b/modules/cms-ui/themes/default/html/views/profile/edit.php @@ -75,7 +75,7 @@ </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class="or-theme-chooser"<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,config('interface','style','default'),0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class="or-theme-chooser"<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,$style,0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?> </select></div> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/profile/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/profile/edit.tpl.src.xml @@ -60,7 +60,7 @@ </part> <part class="input"> <selectbox name="style" list="allstyles" - default="config:interface/style/default" class="or-theme-chooser"></selectbox> + class="or-theme-chooser"></selectbox> </part> </part> <part class="line"> diff --git a/modules/cms-ui/themes/default/html/views/user/edit.php b/modules/cms-ui/themes/default/html/views/user/edit.php @@ -124,7 +124,7 @@ </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class=""<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,config('interface','style','default'),0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class=""<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,$style,0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?> </select></div> </div> </div> @@ -215,5 +215,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/edit.tpl.src.xml @@ -91,8 +91,7 @@ <label for="style" key="user_style"></label> </part> <part class="input"> - <selectbox list="allstyles" name="style" - default="config:interface/style/default"></selectbox> + <selectbox list="allstyles" name="style"></selectbox> </part> </part> </group>