瀏覽代碼

Webapp: Added 'boolean' type support on app setup page

Robert Zollner 6 年之前
父節點
當前提交
ecaa18f69c
共有 2 個文件被更改,包括 14 次插入7 次删除
  1. 1 1
      web/css/styles.min.css
  2. 13 6
      web/templates/admin/setup_webapp.html

+ 1 - 1
web/css/styles.min.css

@@ -1126,6 +1126,7 @@ form#vstobjects .alert {
 .card {
 .card {
   float:left;
   float:left;
   overflow: hidden;
   overflow: hidden;
+  background-color: #f5f5f5;
   border:1px solid #e6e6e6;
   border:1px solid #e6e6e6;
   box-sizing: border-box;
   box-sizing: border-box;
   width:200px;
   width:200px;
@@ -1146,7 +1147,6 @@ form#vstobjects .alert {
 
 
 .card .card-details {
 .card .card-details {
   font-size: 0.8rem;
   font-size: 0.8rem;
-  background-color: #f5f5f5;
   padding: 0.5em 0.8em;
   padding: 0.5em 0.8em;
   border-top: 1px solid #e6e6e6;
   border-top: 1px solid #e6e6e6;
   text-align: center;
   text-align: center;

+ 13 - 6
web/templates/admin/setup_webapp.html

@@ -42,7 +42,7 @@
                         $f_name = $WebappInstaller->formNs() . '_' . $form_name;
                         $f_name = $WebappInstaller->formNs() . '_' . $form_name;
                         $f_type = $form_control;
                         $f_type = $form_control;
                         $f_value = '';
                         $f_value = '';
-                        $f_label = ucwords(str_replace('.', ' ', $form_name));
+                        $f_label = ucwords(str_replace(['.','_'], ' ', $form_name));
                         if (is_array($form_control)) {
                         if (is_array($form_control)) {
                             $f_type = (!empty($form_control['type']))?$form_control['type']:'text';
                             $f_type = (!empty($form_control['type']))?$form_control['type']:'text';
                             $f_value = (!empty($form_control['value']))?$form_control['value']:'';
                             $f_value = (!empty($form_control['value']))?$form_control['value']:'';
@@ -51,25 +51,32 @@
                         $f_value = htmlentities($f_value);
                         $f_value = htmlentities($f_value);
                         $f_label = htmlentities($f_label);
                         $f_label = htmlentities($f_label);
                     ?>
                     ?>
-                    <div class="form-control">
-                        <label for="<?=$f_name?>"><?=$f_label?>
+                    <div class="form-group">
+                        <label style="padding-bottom: 2px;" for="<?=$f_name?>"><?=$f_label?>
                         <?php if ($f_type === 'password'):?>
                         <?php if ($f_type === 'password'):?>
                             / <a href="javascript:randomString('<?=$f_name?>');" class="generate" ><?php print __('generate')?></a>
                             / <a href="javascript:randomString('<?=$f_name?>');" class="generate" ><?php print __('generate')?></a>
                         <?php endif?>
                         <?php endif?>
                         </label>
                         </label>
-                        <p>
+                        
                         <?php if (in_array($f_type, ['select']) && count($form_control['options']) ):?>
                         <?php if (in_array($f_type, ['select']) && count($form_control['options']) ):?>
+                          <p style="margin-top:0;"></p>
                             <select class="vst-list" name="<?=$f_name?>">
                             <select class="vst-list" name="<?=$f_name?>">
                                 <?foreach ($form_control['options'] as $option):?>
                                 <?foreach ($form_control['options'] as $option):?>
                                     <?php $selected = (!empty($form_control['value']) && $option === $form_control['value'])?'selected':''?>
                                     <?php $selected = (!empty($form_control['value']) && $option === $form_control['value'])?'selected':''?>
                                     <option value="<?=$option?>" <?=$selected?>  ><?=htmlentities($option)?></option>
                                     <option value="<?=$option?>" <?=$selected?>  ><?=htmlentities($option)?></option>
                                 <?endforeach?>
                                 <?endforeach?>
                             </select>
                             </select>
+                          </p>
+                        <?php elseif (in_array($f_type, ['boolean'])):?>
+                        <p>
+                            <?php $checked = (!empty($f_value))?'checked':''?>
+                          <input style="width:auto;" type="checkbox" class="vst-input" name="<?=$f_name?>" id="<?=$f_name?>" <?=$checked?> value="true">
+                        </p>
                         <?php else:?>
                         <?php else:?>
+                          <p style="margin-top:0;"></p>
                             <input type="text" size="20" class="vst-input" name="<?=$f_name?>" id="<?=$f_name?>" value="<?=$f_value?>">
                             <input type="text" size="20" class="vst-input" name="<?=$f_name?>" id="<?=$f_name?>" value="<?=$f_value?>">
+                          </p>
                         <?php endif?>
                         <?php endif?>
-
-                        </p>
                     </div>
                     </div>
                 <?php endforeach; ?>
                 <?php endforeach; ?>