Merge pull request #11 from betweenbrain/develop

Sync develop
betweenbrain · May 20, 2014 · 472a27f · 472a27f
2 parents fa8f527 + d2dd055
commit 472a27f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/LICENSE b/LICENSE
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    Menu-Branch-Module  Copyright (C) 2013  Matt Thomas
+    Menu Wrench Copyright (C) 2013-2014 Matt Thomas
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/helper.php b/helper.php
@@ -5,8 +5,8 @@
  * Created    8/6/13 3:41 PM
  * Author     Matt Thomas | matt@betweenbrain.com | http://betweenbrain.com
  * Support    https://github.com/betweenbrain/Menu-Wrench/issues
- * Copyright  Copyright (C) 2013 betweenbrain llc. All Rights Reserved.
- * License    GNU GPL v3 or later
+ * Copyright  Copyright (C) 2013-2014 betweenbrain llc. All Rights Reserved.
+ * License    GNU GPL v2 or later
  */
 
 jimport('joomla.application.menu');

diff --git a/language/en-GB/en-GB.mod_menuwrench.ini b/language/en-GB/en-GB.mod_menuwrench.ini
@@ -1,4 +1,4 @@
-MOD_MENU_WRENCH_DESC="Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu."
+MOD_MENU_WRENCH_DESC="<a href="_QQ_"http://betweenbrain.com/"_QQ_" target="_QQ_"_blank"_QQ_"><img src="_QQ_"http://betweenbrain.com/images/logo.png"_QQ_" /></a><p class="_QQ_"clear"_QQ_">Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu.</p>"
 MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_DESC="Menu item, or items, to NEVER render the menu branch of."
 MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_LABEL="Hide Sub-menu Items"
 MOD_MENU_WRENCH_RENDER_DEPTH_DESC="The levels of depth to render sub-menu items of. Enter 0 to render none."

diff --git a/language/en-GB/en-GB.mod_menuwrench.sys.ini b/language/en-GB/en-GB.mod_menuwrench.sys.ini
@@ -1 +1 @@
-MOD_MENU_WRENCH_DESC="Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu."
+MOD_MENU_WRENCH_DESC="<a href="_QQ_"http://betweenbrain.com/"_QQ_" target="_QQ_"_blank"_QQ_"><img src="_QQ_"http://betweenbrain.com/images/logo.png"_QQ_" /></a><p class="_QQ_"clear"_QQ_">Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu.</p>"
diff --git a/mod_menuwrench.php b/mod_menuwrench.php
@@ -5,8 +5,8 @@
  * Created    8/6/13 2:34 PM
  * Author     Matt Thomas | matt@betweenbrain.com | http://betweenbrain.com
  * Support    https://github.com/betweenbrain/Menu-Wrench/issues
- * Copyright  Copyright (C) 2013 betweenbrain llc. All Rights Reserved.
- * License    GNU GPL v3 or later
+ * Copyright  Copyright (C) 2013-2014 betweenbrain llc. All Rights Reserved.
+ * License    GNU GPL v2 or later
  */
 
 require_once __DIR__ . '/helper.php';

diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml
@@ -3,12 +3,12 @@
            version="2.5"
            method="upgrade">
 	<name>Menu Wrench</name>
-	<creationDate>August 7, 2013</creationDate>
+	<creationDate>May 20, 2014</creationDate>
 	<author>Matt Thomas</author>
 	<authorUrl>http://betweenbrain.com</authorUrl>
-	<copyright>Copyright (C) 2013 betweenbrain llc. All rights reserved.</copyright>
-	<license>GNU General Public License version 3, or later.</license>
-	<version>0.2</version>
+	<copyright>Copyright (C) 2013-2014 betweenbrain llc. All rights reserved.</copyright>
+	<license>GNU General Public License version 2, or later.</license>
+	<version>1.0.0</version>
 	<description>MOD_MENU_WRENCH_DESC</description>
 
 	<files>

diff --git a/tmpl/default.php b/tmpl/default.php
@@ -5,8 +5,8 @@
  * Created    8/6/13 2:34 PM
  * Author     Matt Thomas | matt@betweenbrain.com | http://betweenbrain.com
  * Support    https://github.com/betweenbrain/Menu-Wrench/issues
- * Copyright  Copyright (C) 2013 betweenbrain llc. All Rights Reserved.
- * License    GNU GPL v3 or later
+ * Copyright  Copyright (C) 2013-2014 betweenbrain llc. All Rights Reserved.
+ * License    GNU GPL v2 or later
  */
 ?>
 <ul class="menu">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MOD_MENU_WRENCH_DESC="Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu."
		MOD_MENU_WRENCH_DESC="<a href="_QQ_"http://betweenbrain.com/"_QQ_" target="_QQ_"_blank"_QQ_"><img src="_QQ_"http://betweenbrain.com/images/logo.png"_QQ_" /></a><p class="_QQ_"clear"_QQ_">Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu.</p>"