adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 17:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge -c2923 from trunk to branch 2.0.

Browse Source 
- Add a "Bound Template" column for template extensions.


git-svn-id: http://piwigo.org/svn/branches/2.0@2924 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2008-12-06 02:31:02 +00:00
parent f4f4f9724a
commit 76181e5a49
16 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/extend_for_templates.php
+19 -8
View File
@@ -102,7 +102,13 @@ $eligible_templates = array(
'slideshow.tpl' => 'slideshow',
'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 |
// +-----------------------------------------------------------------------+
@@ -118,9 +124,11 @@ if (isset($_POST['submit']) and !is_adviser())
$handle = $eligible_templates[$original];
$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++;
}
@@ -150,7 +158,7 @@ foreach ($tpl_extension as $file => $conditions)
}
foreach ($new_extensions as $file)
{
$tpl_extension[$file] = array('N/A', 'N/A');
$tpl_extension[$file] = array('N/A', 'N/A', 'N/A');
}
$template->set_filenames(array('extend_for_templates'
@@ -167,14 +175,17 @@ foreach ($tpl_extension as $file => $conditions)
{
$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,)
);
}
}
admin/template/goto/default-layout.css
+1 -1
View File
@@ -7,7 +7,7 @@ TABLE.table2 {
padding: 0;
}
TABLE.table2 TD {
TABLE.table2 TD, TABLE.table2 TH {
padding: 0 5px;
}
admin/template/goto/extend_for_templates.tpl
+4
View File
@@ -9,6 +9,7 @@
<th>{'Replacers'|@translate}</th>
<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}
<tr class="{if $smarty.foreach.extent_loop.index is odd}row1{else}row2{/if}">
@@ -22,6 +23,9 @@
<td>
{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}
</table>