[geeklog-hg] geeklog: Fixed to launch the Filemanager in a new window
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Jan 13 06:14:30 EST 2014
changeset 9423:7ddd4998dc45
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7ddd4998dc45
user: Kenji ITO <mystralkk at gmail.com>
date: Mon Jan 13 09:16:07 2014 +0900
description:
Fixed to launch the Filemanager in a new window
diffstat:
public_html/layout/denim/admin/commandcontrol.thtml | 2 +-
public_html/layout/denim/adminnavigation.thtml | 2 +-
public_html/layout/modern_curve/admin/commandcontrol.thtml | 2 +-
public_html/layout/modern_curve/adminnavigation.thtml | 2 +-
public_html/layout/professional/admin/commandcontrol.thtml | 4 +-
public_html/layout/professional/adminnavigation.thtml | 2 +-
public_html/layout/professional_css/admin/commandcontrol.thtml | 2 +-
public_html/layout/professional_css/adminnavigation.thtml | 2 +-
public_html/lib-common.php | 13 ++++++++-
9 files changed, 20 insertions(+), 11 deletions(-)
diffs (135 lines):
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/denim/admin/commandcontrol.thtml
--- a/public_html/layout/denim/admin/commandcontrol.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/denim/admin/commandcontrol.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -13,7 +13,7 @@
{cc_main_options}
<!-- END ccrow -->
<!-- BEGIN ccitem -->
-<li><a href="{page_url}" style="text-align:center"><img src="{page_image}" style="display:block;margin:5px auto" alt=""{xhtml}>{option_label}</a></li>
+<li><a href="{page_url}" style="text-align:center"{target}><img src="{page_image}" style="display:block;margin:5px auto" alt=""{xhtml}>{option_label}</a></li>
<!-- END ccitem -->
{# end {templatelocation} #}
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/denim/adminnavigation.thtml
--- a/public_html/layout/denim/adminnavigation.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/denim/adminnavigation.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -6,7 +6,7 @@
<ul class="noliststyle">
<!-- END group -->
<!-- BEGIN option -->
-<li class="adminoption sideoption"><a href="{option_url}">{option_label}{display_count}</a></li>
+<li class="adminoption sideoption"><a href="{option_url}"{target}>{option_label}{display_count}</a></li>
<!-- END option -->
<!-- BEGIN current -->
<li class="adminoption_off sideoption_off">{option_label}{display_count}</li>
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/modern_curve/admin/commandcontrol.thtml
--- a/public_html/layout/modern_curve/admin/commandcontrol.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/modern_curve/admin/commandcontrol.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -13,7 +13,7 @@
{cc_main_options}
<!-- END ccrow -->
<!-- BEGIN ccitem -->
-<li><a href="{page_url}"><img src="{page_image}" alt=""{xhtml}></a><a href="{page_url}">{option_label}</a></li>
+<li><a href="{page_url}"{target}><img src="{page_image}" alt=""{xhtml}></a><a href="{page_url}"{target}>{option_label}</a></li>
<!-- END ccitem -->
{# end {templatelocation} #}
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/modern_curve/adminnavigation.thtml
--- a/public_html/layout/modern_curve/adminnavigation.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/modern_curve/adminnavigation.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -4,7 +4,7 @@
<li class="adminoption_off"><b>{group_label}</b></li>
<!-- END group -->
<!-- BEGIN option -->
-<li class="adminoption">{branch_spaces}<a href="{option_url}">{option_label}</a>{display_count}</li>
+<li class="adminoption">{branch_spaces}<a href="{option_url}"{target}>{option_label}</a>{display_count}</li>
<!-- END option -->
<!-- BEGIN current -->
<li class="adminoption_off">{branch_spaces}{option_label}{display_count}</li>
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/professional/admin/commandcontrol.thtml
--- a/public_html/layout/professional/admin/commandcontrol.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/professional/admin/commandcontrol.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -16,8 +16,8 @@
<!-- END ccrow -->
<!-- BEGIN ccitem -->
<div class="moderation-cc-item" style="width:{cc_icon_width}%">
- <a href="{page_url}"><img src="{page_image}" alt=""{xhtml}></a><br{xhtml}>
- <a href="{page_url}">{option_label}</a>
+ <a href="{page_url}"{target}><img src="{page_image}" alt=""{xhtml}></a><br{xhtml}>
+ <a href="{page_url}"{target}>{option_label}</a>
</div>
<!-- END ccitem -->
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/professional/adminnavigation.thtml
--- a/public_html/layout/professional/adminnavigation.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/professional/adminnavigation.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -4,7 +4,7 @@
<li><b>{group_label}</b></li>
<!-- END group -->
<!-- BEGIN option -->
-<li>{branch_spaces}<a href="{option_url}">{option_label}</a>{display_count}</li>
+<li>{branch_spaces}<a href="{option_url}"{target}>{option_label}</a>{display_count}</li>
<!-- END option -->
<!-- BEGIN current -->
<li>{branch_spaces}{option_label}{display_count}</li>
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/professional_css/admin/commandcontrol.thtml
--- a/public_html/layout/professional_css/admin/commandcontrol.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/professional_css/admin/commandcontrol.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -13,7 +13,7 @@
{cc_main_options}
<!-- END ccrow -->
<!-- BEGIN ccitem -->
-<li><a href="{page_url}"><img src="{page_image}" alt=""{xhtml}></a><a href="{page_url}">{option_label}</a></li>
+<li><a href="{page_url}"{target}><img src="{page_image}" alt=""{xhtml}></a><a href="{page_url}"{target}>{option_label}</a></li>
<!-- END ccitem -->
{# end {templatelocation} #}
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/layout/professional_css/adminnavigation.thtml
--- a/public_html/layout/professional_css/adminnavigation.thtml Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/layout/professional_css/adminnavigation.thtml Mon Jan 13 09:16:07 2014 +0900
@@ -4,7 +4,7 @@
<li class="adminoption_off"><b>{group_label}</b></li>
<!-- END group -->
<!-- BEGIN option -->
-<li class="adminoption">{branch_spaces}<a href="{option_url}">{option_label}</a>{display_count}</li>
+<li class="adminoption">{branch_spaces}<a href="{option_url}"{target}>{option_label}</a>{display_count}</li>
<!-- END option -->
<!-- BEGIN current -->
<li class="adminoption_off">{branch_spaces}{option_label}{display_count}</li>
diff -r 2b5b93189f8c -r 7ddd4998dc45 public_html/lib-common.php
--- a/public_html/lib-common.php Mon Jan 13 09:15:41 2014 +0900
+++ b/public_html/lib-common.php Mon Jan 13 09:16:07 2014 +0900
@@ -3669,7 +3669,8 @@
'url' => $_CONF['site_url'] . '/filemanager/index.php',
'lang' => $LANG01['filemanager'],
'num' => '',
- 'image' => $_CONF['layout_url'] . '/images/icons/filemanager.' . $_IMAGE_TYPE),
+ 'image' => $_CONF['layout_url'] . '/images/icons/filemanager.' . $_IMAGE_TYPE,
+ 'target' => '_blank'),
array('condition' => true,
'url' =>$_CONF['site_url'] . '/users.php?mode=logout',
'lang' => $LANG01[35],
@@ -3736,6 +3737,10 @@
}
$adminmenu->set_var('branch_spaces', ' ');
+ if (isset($cc_arr[$i]['target'])) {
+ $adminmenu->set_var('target', ' target="' . $cc_arr[$i]['target'] . '"');
+ }
+
$item = $adminmenu->finish($adminmenu->parse('item',
($thisUrl == $cc_arr[$i]['url']) ? 'current' : 'option'));
@@ -3746,7 +3751,11 @@
$admin_templates->set_var('page_image', $cc_arr[$i]['image']);
$admin_templates->set_var('option_label', $cc_arr[$i]['lang']);
$admin_templates->set_var('cell_width', ((int)(100 / ICONS_PER_ROW)) . '%');
-
+
+ if (isset($cc_arr[$i]['target'])) {
+ $admin_templates->set_var('target', ' target="' . $cc_arr[$i]['target'] . '"');
+ }
+
$item = $admin_templates->parse('cc_main_options', 'ccitem', false);
}
}
More information about the geeklog-cvs
mailing list