Changeset 9933
- Timestamp:
- 11/14/08 15:50:07 (2 months ago)
- Files:
-
- branches/0.8/jaws/html/gadgets/StaticPage/Actions.php (modified) (2 diffs)
- branches/0.8/jaws/html/gadgets/StaticPage/AdminModel.php (modified) (1 diff)
- branches/0.8/jaws/html/gadgets/StaticPage/HTML.php (modified) (2 diffs)
- branches/0.8/jaws/html/gadgets/StaticPage/Info.php (modified) (1 diff)
- branches/0.8/jaws/html/gadgets/StaticPage/LayoutHTML.php (modified) (2 diffs)
- branches/0.8/jaws/html/gadgets/StaticPage/schema/0.8.1.xml (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/0.8/jaws/html/gadgets/StaticPage/Actions.php
r7928 r9933 11 11 $actions = array(); 12 12 13 $actions['Index'] = array('NormalAction'); 13 $actions['Index'] = array('NormalAction, LayoutAction', 14 _t('STATICPAGE_LAYOUT_LIST'), 15 _t('STATICPAGE_LAYOUT_LIST_DESCRIPTION')); 14 16 $actions['Page'] = array('NormalAction'); 15 16 $actions['Display'] = array('LayoutAction',17 _t('STATICPAGE_LAYOUT_LIST'),18 _t('STATICPAGE_LAYOUT_LIST_DESCRIPTION'));19 17 20 18 $actions['AddPage'] = array('AdminAction'); … … 27 25 $actions['EditTranslation'] = array('AdminAction'); 28 26 $actions['SaveEditTranslation'] = array('AdminAction'); 29 ?>branches/0.8/jaws/html/gadgets/StaticPage/AdminModel.php
r9348 r9933 120 120 } 121 121 122 //rename layout action 123 $layoutModel = $GLOBALS['app']->LoadGadget('Layout', 'AdminModel'); 124 $result = $layoutModel->ChangeGadgetActionName('StaticPage', 'Display', 'Index'); 125 if (Jaws_Error::IsError($result)) { 126 return $result; 127 } 128 122 129 return true; 123 130 } branches/0.8/jaws/html/gadgets/StaticPage/HTML.php
r9333 r9933 100 100 $tpl->ParseBlock('page'); 101 101 102 //cache output of this action 103 $GLOBALS['app']->Layout->SetCurrentActionCacheable(); 104 102 105 return $tpl->Get(); 103 106 } … … 112 115 { 113 116 $layoutGadget = $GLOBALS['app']->LoadGadget('StaticPage', 'LayoutHTML'); 114 return $layoutGadget-> Display();117 return $layoutGadget->Index(); 115 118 } 116 119 } branches/0.8/jaws/html/gadgets/StaticPage/Info.php
r9322 r9933 16 16 $this->GadgetName(_t('STATICPAGE_NAME')); 17 17 $this->GadgetDescription(_t('STATICPAGE_DESCRIPTION')); 18 $this->GadgetVersion('0.8. 1');18 $this->GadgetVersion('0.8.2'); 19 19 $this->Doc('gadget/StaticPage'); 20 20 $this->ListURL(true); branches/0.8/jaws/html/gadgets/StaticPage/LayoutHTML.php
r9665 r9933 17 17 * @return string 18 18 */ 19 function Display()19 function Index() 20 20 { 21 21 $model = $GLOBALS['app']->LoadGadget('StaticPage', 'Model'); … … 43 43 $tpl->ParseBlock('index'); 44 44 45 //cache output of this action 46 $GLOBALS['app']->Layout->SetCurrentActionCacheable(); 47 45 48 return $tpl->Get(); 46 49 }
