From 73681a4b4307c0373676ab5941650cebbc0dd807 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Oct 2010 19:55:56 +0000
Subject: [PATCH] Added Link Us Block; Fixed a small bug in user menu;

---
 .../en/mods/portal/portal_link_us_module.php  |  38 ++++++++
 .../en/mods/portal/portal_news_module.php     |   2 +
 root/portal/modules/portal_link_us.php        |  84 ++++++++++++++++++
 root/portal/modules/portal_user_menu.php      |   2 +-
 .../template/portal/modules/link_us_side.html |   5 ++
 .../theme/images/portal/portal_link_us.png    | Bin 0 -> 895 bytes
 6 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 root/language/en/mods/portal/portal_link_us_module.php
 create mode 100644 root/portal/modules/portal_link_us.php
 create mode 100644 root/styles/prosilver/template/portal/modules/link_us_side.html
 create mode 100644 root/styles/prosilver/theme/images/portal/portal_link_us.png

diff --git a/root/language/en/mods/portal/portal_link_us_module.php b/root/language/en/mods/portal/portal_link_us_module.php
new file mode 100644
index 00000000..ad8a663c
--- /dev/null
+++ b/root/language/en/mods/portal/portal_link_us_module.php
@@ -0,0 +1,38 @@
+<?php
+/**
+* @package Portal - Link Us
+* @version $Id$
+* @copyright (c) 2009, 2010 Board3 Portal Team
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LINK_US'		=> 'Link to us',
+	'LINK_US_TXT'	=> 'Please feel free to link to <strong>%s</strong>. Use the following HTML:',
+));
+
+?>
\ No newline at end of file
diff --git a/root/language/en/mods/portal/portal_news_module.php b/root/language/en/mods/portal/portal_news_module.php
index c8084731..70637c9c 100644
--- a/root/language/en/mods/portal/portal_news_module.php
+++ b/root/language/en/mods/portal/portal_news_module.php
@@ -65,6 +65,8 @@ $lang = array_merge($lang, array(
 	'PORTAL_NEWS_SHOW_LAST_EXP'		=> 'When activated, the newest will be sorted in order to the newest posts. When deactivated, the news will be sorted in order to the newest topic.',
 	'PORTAL_NEWS_ARCHIVE'				=> 'Enable the news archive system',
 	'PORTAL_NEWS_ARCHIVE_EXP'		=> 'If enabled the news archive system / page numbers will be displayed.',
+	'PORTAL_SHOW_REPLIES_VIEWS'				=> 'Display the number of replies and views',
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'		=> 'This setting pertains to the compact block.<br />When Yes, the number of replies and views are shown in 2 extra columns. When No, replies and views will be shown beside the forum name. Select No if you have problems with the display of the extra columns due to the extra width required.',
 ));
 
 ?>
\ No newline at end of file
diff --git a/root/portal/modules/portal_link_us.php b/root/portal/modules/portal_link_us.php
new file mode 100644
index 00000000..1f704dd6
--- /dev/null
+++ b/root/portal/modules/portal_link_us.php
@@ -0,0 +1,84 @@
+<?php
+/**
+* @package Portal - Link Us
+* @version $Id$
+* @copyright (c) 2009, 2010 Board3 Portal Team
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @package Clock
+*/
+class portal_link_us_module
+{
+	/**
+	* Allowed columns: Just sum up your options (Exp: left + right = 10)
+	* top		1
+	* left		2
+	* center	4
+	* right		8
+	* bottom	16
+	*/
+	var $columns = 10;
+
+	/**
+	* Default modulename
+	*/
+	var $name = 'LINK_US';
+
+	/**
+	* Default module-image:
+	* file must be in "{T_THEME_PATH}/images/portal/"
+	*/
+	var $image_src = 'portal_link_us.png';
+
+	/**
+	* module-language file
+	* file must be in "language/{$user->lang}/mods/portal/"
+	*/
+	var $language = 'portal_link_us_module';
+
+	function get_template_side($module_id)
+	{
+		global $config, $template, $user;
+
+		//doing the easy way ;)
+		$u_link = generate_board_url();
+
+		// Assign specific vars
+		$template->assign_vars(array(
+			'LINK_US_TXT'		=> sprintf($user->lang['LINK_US_TXT'], $config['sitename']),
+			'U_LINK_US'			=> '&lt;a&nbsp;href=&quot;' . $u_link . '&quot;&nbsp;' . (($config['site_desc']) ? 'title=&quot;' . $config['site_desc'] . '&quot;' : '' ) . '&gt;' . (($config['sitename']) ? $config['sitename'] : $u_link ) . '&lt;/a&gt;',
+		));
+
+		return 'link_us_side.html';
+	}
+
+	function get_template_acp($module_id)
+	{
+		return false;
+	}
+
+	/**
+	* API functions
+	*/
+	function install($module_id)
+	{
+		return true;
+	}
+
+	function uninstall($module_id)
+	{
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/root/portal/modules/portal_user_menu.php b/root/portal/modules/portal_user_menu.php
index d9582133..a872aa9e 100644
--- a/root/portal/modules/portal_user_menu.php
+++ b/root/portal/modules/portal_user_menu.php
@@ -157,7 +157,7 @@ class portal_user_menu_module
 
 	function get_template_acp($module_id)
 	{
-		return false
+		return false;
 	}
 
 	/**
diff --git a/root/styles/prosilver/template/portal/modules/link_us_side.html b/root/styles/prosilver/template/portal/modules/link_us_side.html
new file mode 100644
index 00000000..556c8e5e
--- /dev/null
+++ b/root/styles/prosilver/template/portal/modules/link_us_side.html
@@ -0,0 +1,5 @@
+<!--version $Id$ //-->
+{$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{T_THEME_PATH}/images/portal/portal_link_us.png" width="16" height="16" alt="" />&nbsp;<!-- ENDIF -->{L_LINK_US}{$LR_BLOCK_H_R}
+	{LINK_US_TXT}<br /><br />
+	<input type="text" tabindex="9" size="28" value="{U_LINK_US}" class="inputbox autowidth" onclick="this.focus();this.select();" /><br />
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
diff --git a/root/styles/prosilver/theme/images/portal/portal_link_us.png b/root/styles/prosilver/theme/images/portal/portal_link_us.png
new file mode 100644
index 0000000000000000000000000000000000000000..c688d5f6f9ae0dc083c5fac2316c819921a6c56a
GIT binary patch
literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#5lKWrRCwBA
zR8_CMu4k&G^7Hrq|9}26F#P=w#Qz{Pi2n!5|ML$j4wd`M$i(>S#@)vN0mNeCVJPEJ
z6w31O8AQV`82*F6KcV>dABfzK-wX_F+zbqiD>sS&1Q5%+Pyhby-}9E?(}y1n%uEan
z|A0392igEc5d0s4|3SrAfCMj)^_7{E;p^AG{{aGs<>TkS4Dniw3=Uc%V1<l~|A82!
zlM$=|1Q;2R!G8uOphY_`|6)kn{Eq=3fLQ)8GBNP+a5B7ocAMeoiL(rvTAB=IW@Zep
zU%zHJaNr=rKcJ_XfI9wzAkffXKYuV7>!~qtaT@^bU}gXaAeKK2OhCW?V_@duVh|D*
zW8mWA1>3{S%)%fjC=B!x$VET{{{IK#U%)_NW#?x2^X)GKNH0JDferZm=MRITk`fp*
zK>aNwB*@_6;>dstTsrZQ;XgAY13&<=`~y0Jk%^h%*`xamm#*GokXKM((9~3Cc=zr-
z!^Ml282$oX#|R9RzkeaY`t#>626aUVpdJ;VMNA9;0R#*KW^gcl{PdOK>9ZFM0)m2I
zr~dfyi{bh6R}6pt`~wFn$SeQ<|6}<6{TG9{AQ!`bR-hozVt@c*`2#fN=da%knua<I
znmRgQ=l%ZumqAKOoFOVI6ubL>{baa#^fM?v7ytqY91Bc9lit31&T#ksV+JvCaRzyL
zIiMFlFx<a?AM6EC+W7bHAJ`SYfR@RM@c~^W12lk{0U&@_{sK*5W@cu1aQ`90jvf0M
z%*;(06cpqcK79B9jK(7je}Jw5MdLr9^Zx@4`2OPugN30c1GBI!DA6zg1Q3Hl_|A`O
zj=cGg0)Bq`|Nr-QAmcC4+rUin>-+z|-@g3+`RT*|uW#S~|NHLQ{}p?l{pWDq{}CX7
zSU7n&nfBjjVz~Y0EjXQnLK~<J?CifFKG0S~X8I5I1`FdqhC3fP8Gf^|GXVq;%Zta)
zUv1p^pX1XvV7>#Uw7;-){~w|W#Qyh>5h-&3@jp<eU}9wW_VOJ-05O81j1mA4U;qz<
VlZv?)8s-21002ovPDHLkV1k4gr40Z8

literal 0
HcmV?d00001