Changeset 958328

Timestamp:

07/31/2014 08:59:13 PM (11 years ago)

Author:

v-media

Message:

Version 1.6

Location:

foodlist/trunk

Files:

• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuIdShortcode.php (modified) (1 diff)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuItemIdShortcode.php (modified) (2 diffs)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuItemPermalinkShortcode.php (added)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuPermalinkShortcode.php (added)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuSectionPermalinkShortcode.php (added)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuSectionTitleShortcode.php (modified) (2 diffs)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuItemView.php (modified) (3 diffs)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuSectionView.php (modified) (4 diffs)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuView.php (modified) (3 diffs)
• locale/foodlist-pl_PL.mo (added)
• locale/foodlist-pl_PL.po (added)
• plugin.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuIdShortcode.php

@@ -17 +17 @@
     public function apply($attrs, $content = null)
     {
+        /* @var MenuPost $curmenu */
         $curmenu = Manager::getInstance()->get('curmenu');
-        /* @var $curmenu MenuPost */
         $postData = $curmenu->getPostData();
         $id = $postData['id'];

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuItemIdShortcode.php

@@ -5 +5 @@
 use Artprima\Text\Shortcode;
 use Artprima\Text\ShortcodeManager;
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Post\MenuItemPost;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Manager;
 
@@ -16 +17 @@
     public function apply($attrs, $content = null)
     {
+        /** @var MenuItemPost $cur */
         $cur = Manager::getInstance()->get('curitem');
         $postData = $cur->getPostData();

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuSectionTitleShortcode.php

@@ -5 +5 @@
 use Artprima\Text\Shortcode;
 use Artprima\Text\ShortcodeManager;
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Post\MenuSectionPost;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Manager;
 
@@ -16 +17 @@
     public function apply($attrs, $content = null)
     {
+        /** @var MenuSectionPost $cur */
         $cur = Manager::getInstance()->get('cursection');
         $postData = $cur->getPostData();

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuItemView.php

@@ -16 +16 @@
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemIdShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemInstanceShortcode;
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemPermalinkShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemPriceShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemTagDescriptionShortcode;
@@ -34 +35 @@
             $sm = new ShortcodeManager();
             $sm->registerShortcode(new MenuItemIdShortcode());
+            $sm->registerShortcode(new MenuItemPermalinkShortcode());
             $sm->registerShortcode(new MenuItemInstanceShortcode());
             $sm->registerShortcode(new MenuItemTitleShortcode());
@@ -44 +46 @@
             $sm->registerShortcode(new MenuItemTagIconUrlShortcode());
             $sm->registerShortcode(new MenuItemTagDescriptionShortcode());
+
+            self::$sm = $sm;
             do_action('foodlist_register_menu_shortcode', self::$sm);
         }
-        return $sm->applyShortcodes($content);
+        return self::$sm->applyShortcodes($content);
     }
     

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuSectionView.php

@@ -8 +8 @@
 namespace Foodlist\Project\WordPress\Plugin\Foodlist\Generic\View\Menu;
 
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Post\MenuSectionPost;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Post\MenuSectionPostFactory;
 use Artprima\WordPress\Helper\Settings as SettingsHelper;
@@ -16 +17 @@
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuSectionIdShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuSectionInstanceShortcode;
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuSectionPermalinkShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuSectionTitleShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Manager;
@@ -29 +31 @@
             $sm = new ShortcodeManager();
             $sm->registerShortcode(new MenuSectionIdShortcode());
+            $sm->registerShortcode(new MenuSectionPermalinkShortcode());
             $sm->registerShortcode(new MenuSectionInstanceShortcode());
             $sm->registerShortcode(new MenuSectionTitleShortcode());
@@ -34 +37 @@
             $sm->registerShortcode(new MenuItemsShortcode());
             $sm->registerShortcode(new MenuItemShortcode());
+            self::$sm = $sm;
             do_action('foodlist_register_menu_shortcode', self::$sm);
         }
-        return $sm->applyShortcodes($content);
+        return self::$sm->applyShortcodes($content);
     }
 
     public function getHtml()
     {
+        /** @var MenuSectionPost $menuSection */
         $menuSection = MenuSectionPostFactory::getOne($this->getId());
         

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuView.php

@@ -13 +13 @@
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuExcerptShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuIdShortcode;
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuPermalinkShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuSectionShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuSectionsShortcode;
@@ -28 +29 @@
             $sm = new ShortcodeManager();
             $sm->registerShortcode(new MenuIdShortcode());
+            $sm->registerShortcode(new MenuPermalinkShortcode());
             $sm->registerShortcode(new MenuTitleShortcode($args));
             $sm->registerShortcode(new MenuTitleTextShortcode());
@@ -33 +35 @@
             $sm->registerShortcode(new MenuSectionsShortcode());
             $sm->registerShortcode(new MenuSectionShortcode());
+            self::$sm = $sm;
             do_action('foodlist_register_menu_shortcode', self::$sm);
         }
 
-        return $sm->applyShortcodes($content);
+        return self::$sm->applyShortcodes($content);
     }
 

foodlist/trunk/plugin.php

@@ -12 +12 @@
 Author: Artprima
 Author URI: http://artprima.eu/
-Version: 1.5
+Version: 1.6
 */
 
-define('FOODLIST_VERSION', '1.5');
+define('FOODLIST_VERSION', '1.6');
 define('FOODLIST_MIN_PHP_VERSION', '5.3.3');
 define('FOODLIST_MIN_WP_VERSION', '3.4.0');

foodlist/trunk/readme.txt

@@ -47 +47 @@
 == ChangeLog ==
 
+= Version 1.6 =
+
+* New shortcodes menu template shortcodes: menu_permalink, menu_section_permalink and menu_item_permalink (can be used in the corresponding templates)
+* Polish language translation files (thanks to Paweł Krawczyk)
+
 = Version 1.5 =