Changeset 2924 for branches/2.0/admin

Timestamp:

Dec 6, 2008, 3:31:02 AM (15 years ago)

Author:

patdenice

Message:

merge -c2923 from trunk to branch 2.0.

• Add a "Bound Template" column for template extensions.

Location:

branches/2.0/admin

Files:

• extend_for_templates.php (modified) (4 diffs)
• template/goto/default-layout.css (modified) (1 diff)
• template/goto/extend_for_templates.tpl (modified) (2 diffs)

branches/2.0/admin/extend_for_templates.php

@@ -103 +103 @@
     'tags.tpl'                   => 'tags',
     'upload.tpl'                 => 'upload',);
-  $flip_templates = array_flip($eligible_templates);
+
+$flip_templates = array_flip($eligible_templates);
+
+$available_templates = array_merge(
+  array('N/A' => '----------'),
+  get_dirs(PHPWG_ROOT_PATH.'template'));
+
 // +-----------------------------------------------------------------------+
 // |                            selected templates                         |
@@ -119 +125 @@
     $url_keyword = $_POST['url'][$i];
     if ($url_keyword == '----------') $url_keyword = 'N/A';
+    $bound_tpl = $_POST['bound'][$i];
+    if ($bound_tpl == '----------') $bound_tpl = 'N/A';
     if ($handle != 'N/A')
     {
-      $replacements[$newtpl] = array($handle, $url_keyword);
+      $replacements[$newtpl] = array($handle, $url_keyword, $bound_tpl);
     }
     $i++;
@@ -151 +159 @@
 foreach ($new_extensions as $file)
 {
-  $tpl_extension[$file] = array('N/A', 'N/A');
+  $tpl_extension[$file] = array('N/A', 'N/A', 'N/A');
 }
 
@@ -168 +176 @@
   $handle = $conditions[0];
   $url_keyword = $conditions[1];
+  $bound_tpl = $conditions[2];
   {  
   $template->append('extents',
     array(
-      'replacer'      => $file,
-      'url_parameter' => $relevant_parameters,
-      'original_tpl'  => array_keys($eligible_templates),
-      'selected_tpl'  => $flip_templates[$handle],
-      'selected_url'  => $url_keyword,)
+      'replacer'       => $file,
+      'url_parameter'  => $relevant_parameters,
+      'original_tpl'   => array_keys($eligible_templates),
+      'bound_tpl'          => $available_templates,
+      'selected_tpl'   => $flip_templates[$handle],
+      'selected_url'   => $url_keyword,
+      'selected_bound' => $bound_tpl,)
       );
   }

branches/2.0/admin/template/goto/default-layout.css

@@ -8 +8 @@
 }
 
-TABLE.table2 TD {
+TABLE.table2 TD, TABLE.table2 TH {
         padding: 0 5px;
 }

branches/2.0/admin/template/goto/extend_for_templates.tpl

@@ -10 +10 @@
       <th>{'Original templates'|@translate}</th>
       <th>{'Optional URL keyword'|@translate}</th>
+      <th>{'Bound template'|@translate}</th>
     </tr>
     {foreach from=$extents item=tpl name=extent_loop}
@@ -23 +24 @@
         {html_options name=url[] output=$tpl.url_parameter values=$tpl.url_parameter selected=$tpl.selected_url}
       </td>
+      <td>
+        {html_options name=bound[] output=$tpl.bound_tpl values=$tpl.bound_tpl selected=$tpl.selected_bound}
+      </td>
     </tr>
     {/foreach}