#468 관련 위젯 group 태그 지원

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4168 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/widget/tpl/widget_generate_code.html

@@ -11,8 +11,6 @@
     </div>
 
     <div id="popBody">
-
-
         <table cellspacing="0" class="adminTable">
         <col width="100" />
         <col />
@@ -50,6 +48,16 @@
             </td>
         </tr>
         <!--@foreach($widget_info->extra_var as $id => $var)-->
+
+        <!--@if($var->group && ((!$group) || $group != $var->group))-->
+        {@$group = $var->group}
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="150" />
+        <col width="*" />
+        <caption>{$group}</caption>
+        <!--@end-->
+
         <tr>
             <th scope="row">
                 {$var->name}
@@ -92,6 +100,14 @@
             </td>
         </tr>
         <!--@end-->
+
+        <!--@if($group)-->
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="150" />
+        <col width="*" />
+        <!--@end-->
+
         <tr>
             <th>{$lang->widget_code}</th>
             <td><textarea readonly="true" id="widget_code" class="inputTypeTextArea w100"></textarea></td>

modules/widget/tpl/widget_generate_code_in_page.html

@@ -18,7 +18,6 @@
     </div>
 
     <div id="popBody">
-
         <table cellspacing="0" class="adminTable">
         <col width="150" />
         <col />
@@ -61,6 +60,16 @@
             </td>
         </tr>
         <!--@foreach($widget_info->extra_var as $id => $var)-->
+
+        <!--@if($var->group && ((!$group) || $group != $var->group))-->
+        {@$group = $var->group}
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="150" />
+        <col width="*" />
+        <caption>{$group}</caption>
+        <!--@end-->
+
         <tr>
             <th scope="row">
                 {$var->name}

modules/widget/widget.model.php

@@ -93,8 +93,12 @@
             $buff .= sprintf('$widget_info->author->description = "%s";', $xml_obj->author->description->body);
 
             // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-            if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var;
+            $extra_var_groups = $xml_obj->extra_vars->group;
-            else $extra_vars = $xml_obj->extra_vars->var;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
+                if(!is_array($group->var)) $extra_vars = array($group->var);
     
                 if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
                     $extra_var_count = count($extra_vars);
@@ -109,6 +113,7 @@
                         $name = $var->name->body?$var->name->body:$var->title->body;
                         $type = $var->attrs->type?$var->attrs->type:$var->type->body;
 
+                        $buff .= sprintf('$widget_info->extra_var->%s->group = "%s";', $id, $group->title->body);
                         $buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
                         $buff .= sprintf('$widget_info->extra_var->%s->type = "%s";', $id, $type);
                         $buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
@@ -125,6 +130,7 @@
     
                     }
                 }
+            }
 
             $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
             FileHandler::writeFile($cache_file, $buff);