Changeset 23395

Timestamp:

Jun 20, 2013, 12:51:22 PM (11 years ago)

Author:

mistic100

Message:

corrections and example of {html_style}, {html_options}, API info

Location:

extensions/skeleton/trunk

Files:

• admin/config.php (modified) (2 diffs)
• admin/template/config.tpl (modified) (3 diffs)
• admin/template/home.tpl (modified) (1 diff)
• include/install.inc.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (1 diff)
• template/menubar_skeleton.tpl (modified) (1 diff)
• template/skeleton_page.tpl (modified) (1 diff)

extensions/skeleton/trunk/admin/config.php

@@ -12 +12 @@
     'option1' => intval($_POST['option1']),
     'option2' => isset($_POST['option2']),
+    'option3' => $_POST['option3'],
     );
       
@@ -18 +19 @@
 }
 
+$select_options = array(
+  'one' => l10n('One'),
+  'two' => l10n('Two'),
+  'three' => l10n('Three'),
+  );
+  
 // send config to template
 $template->assign(array(
   'skeleton' => $conf['skeleton'],
+  'select_options' => $select_options
   ));
 

extensions/skeleton/trunk/admin/template/config.tpl

@@ -4 +4 @@
 jQuery('input[name="option2"]').change(function() {
   $('.option1').toggle();
+});
+
+jQuery(".showInfo").tipTip({
+  delay: 0,
+  fadeIn: 200,
+  fadeOut: 200,
+  maxWidth: '300px',
+  defaultPosition: 'bottom'
 });
 {/literal}{/footer_script}
@@ -18 +26 @@
     <li>
       <label>
-        <span class="property">
-          {'Checkbox'|@translate}
-          <a class="showInfo" title="{'Check me!'|@translate}">i</a>
-        </span>
         <input type="checkbox" name="option2" value="1" {if $skeleton.option2}checked="checked"{/if}>
+        <b>{'Checkbox'|@translate}</b>
       </label>
+      <a class="showInfo" title="{'Check me!'|@translate}">i</a>
     </li>
     <li class="option1" {if not $skeleton.option2}style="display:none;"{/if}>
       <label>
-        <span class="property">{'Integer'|@translate}</span>
+        <b>{'Integer'|@translate}</b>
         <input type="text" name="option1" value="{$skeleton.option1}" size="4">
+      </label>
+    </li>
+    <li>
+      <label>
+        <b>{'Select'|@translate}</b>
+        {html_options name=option3 options=$select_options selected=$skeleton.option3}
       </label>
     </li>
@@ -34 +46 @@
 </fieldset>
 
-<p style="text-align:left;"><input type="submit" name="save_config" value="{'Save Settings'|@translate}"></p>
+<p class="formButtons"><input type="submit" name="save_config" value="{'Save Settings'|@translate}"></p>
 
 </form>

extensions/skeleton/trunk/admin/template/home.tpl

@@ -1 +1 @@
 {combine_css path=$SKELETON_PATH|@cat:"admin/template/style.css"}
+
+{html_style}{literal}
+h4 { text-align:left !important; }
+{/literal}{/html_style}
 
 <div class="titrePage">

extensions/skeleton/trunk/include/install.inc.php

@@ -21 +21 @@
   if (empty($conf['skeleton']))
   {
-    $skeleton_default_config = serialize(array(
+    $conf['skeleton'] = serialize(array(
       'option1' => 10,
       'option2' => true,
       ));
   
-    conf_update_param('skeleton', $skeleton_default_config);
-    $conf['skeleton'] = $skeleton_default_config;
+    conf_update_param('skeleton', $conf['skeleton']);
   }
   else
@@ -33 +32 @@
     // if you need to test the "old" configuration you must check if not yet unserialized
     $old_conf = is_string($conf['skeleton']) ? unserialize($conf['skeleton']) : $conf['skeleton'];
+    
+    if (empty($old_conf['option3']))
+    {
+      $old_conf['option3'] = 'two';
+    }
+    
+    $conf['skeleton'] = serialize($old_conf);
+    conf_update_param('skeleton', $conf['skeleton']);
   }
   

extensions/skeleton/trunk/include/ws_functions.inc.php

@@ -10 +10 @@
     'ws_php_info',
     array(
-      'what' => array('default'=> 'INFO_ALL'),
+      'what' => array('default'=>'INFO_ALL', 'info'=>'This parameter has a default value'),
+      'ids' => array('flags'=>WS_PARAM_FORCE_ARRAY, 'info'=>'This one must be an array'),
       ),
     'Returns phpinfo (don\'t use XML request format)'

extensions/skeleton/trunk/template/menubar_skeleton.tpl

@@ -1 +1 @@
 <dt>{$block->get_title()}</dt>
 <dd>
-  Menublock added by Skeleton plugin
+  {'Menublock added by Skeleton plugin'|@translate}
         <ul>{strip}
                 {foreach from=$block->data item=link}

extensions/skeleton/trunk/template/skeleton_page.tpl

@@ -46 +46 @@
 
 
-{if $clear}<div style="clear: both;"></div>
+{if isset($clear)}<div style="clear: both;"></div>
 </div>{/if}
 </div>{* <!-- content --> *}