aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-01-22 22:06:17 +0000
committerrub <rub@piwigo.org>2007-01-22 22:06:17 +0000
commit767064c9fe94e28acb77a1123c2853281d13f2d1 (patch)
treeb55e77f45d947323d7e05f9efa5d865ba78eccf1
parentee5dbaefbbf1d3d42e33bf429b39450ca9d91a34 (diff)
Issue 0000624: Enhanced Links Menu
Add name and features options when new_window is true. (To display a popup for example) git-svn-id: http://piwigo.org/svn/trunk@1743 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/config_default.inc.php9
-rw-r--r--include/menubar.inc.php8
-rw-r--r--template/yoga/menubar.tpl5
3 files changed, 20 insertions, 2 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index ce87e18fc..b67aa6c0a 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -179,6 +179,9 @@ $conf['show_version'] = true;
// 'http://phpwebgallery.net' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'),
// 'http://forum.phpwebgallery.net' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
// 'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return $user[\'is_the_guest\'];'),
+// 'http://download.gna.org/phpwebgallery/' =>
+// array('label' => 'PopUp', 'new_window' => true,
+// 'nw_name' => 'PopUp', 'nw_features' => 'width=800,height=450,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'),
// );
// Parameters:
// 'label':
@@ -186,6 +189,12 @@ $conf['show_version'] = true;
// 'new_window':
// If true open link on tab/window
// [Default value is true if it's not defined]
+// 'nw_name':
+// Name use when new_window is true
+// [Default value is '' if it's not defined]
+// 'nw_features':
+// features use when new_window is true
+// [Default value is '' if it's not defined]
// 'eval_visible':
// It's php code witch must return if the link is visible or not
// [Default value is true if it's not defined]
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 26e24df16..4a35cccbf 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -76,7 +76,13 @@ foreach ($conf['links'] as $url => $url_data)
);
if (!isset($url_data['new_window']) or $url_data['new_window'])
{
- $template->assign_block_vars('links.link.new_window', array('1'=>'1'));
+ $template->assign_block_vars(
+ 'links.link.new_window',
+ array(
+ 'name' => (isset($url_data['nw_name']) ? $url_data['nw_name'] : ''),
+ 'features' => (isset($url_data['nw_features']) ? $url_data['nw_features'] : '')
+ )
+ );
}
}
}
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 37dcd6995..85b77cefe 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -9,7 +9,10 @@
<li>
<a href="{links.link.URL}"
<!-- BEGIN new_window -->
- onclick="window.open(this.href, ''); return false;"
+ onclick="window.open(this.href,
+ '{links.link.new_window.name}',
+ '{links.link.new_window.features}'
+ ); return false;"
<!-- END new_window -->
>{links.link.LABEL}
</a>