refactored layouts, putting styles & scripts declarations in doc header

xarala · Sep 1, 2010 · f6419e4 · f6419e4
1 parent d3793bc
commit f6419e4
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 86 deletions.
diff --git a/mod_xws_content/mod_xws_content.xml b/mod_xws_content/mod_xws_content.xml
@@ -9,7 +9,7 @@
 	<license>GPL</license>
 	<authorEmail>pathe.sene@gmail.com</authorEmail>
 	<authorUrl>www.xarala.sn</authorUrl>
-	<version>0.6.6</version>
+	<version>0.6.7</version>
 	<description>
   <![CDATA[
     <h2>Xws_Content: displaying joomla content items made stupid simple</h2>

diff --git a/mod_xws_content/tmpl/accordion/default.php b/mod_xws_content/tmpl/accordion/default.php
@@ -16,20 +16,30 @@
  * ----------------------------------------------------------------------------- */
   defined('_JEXEC') or die('Restricted access');
 
+/* Load jquery ui css assets
+ * ----------------------------------------------------------------------------- */
+  modXwsContentHelper::loadJqueryUiStylesheets($params);
+
 /**
  * Load javascript assets
  * jquery
  * jquery-ui & xwsUiHelpers
  * ----------------------------------------------------------------------------- */
   modXwsContentHelper::loadJquery($params);
   modXwsContentHelper::loadJqueryUi($params);
-
-/* Load jquery ui css assets
- * ----------------------------------------------------------------------------- */
-  modXwsContentHelper::loadJqueryUiStylesheets($params);
-
+  $this->_doc->addScriptDeclaration("
+  // <![CDATA[
+    jQuery.noConflict();
+    jQuery(document).ready(function(){
+      jQuery.xwsUiHelpers.enableAccordions();
+      jQuery.xwsReadmore.buildButtons({
+        icon: 'ui-icon-arrowstop-1-e',
+        wrapper: 'p.xwsReadMoreWrapper'
+      });
+    });
+  // ]]>
+  ");
 ?>
-
 <div id = "xwsAccordionModule<?php echo $module->id; ?>">
   <?php foreach ($list as  $item) : ?>
   <h3><a href="#" rel="nofollow" title="<?php echo $item->title; ?>"><?php echo $item->title; ?></a></h3>
@@ -43,21 +53,4 @@
   </div>
   <?php endforeach; ?>
 </div>
-<?php
-/**
- * Setup javascript behavior for the layout
- */
-?>
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
-  jQuery.noConflict();
-  jQuery(document).ready(function(){
-    jQuery.xwsUiHelpers.enableAccordions();
-    jQuery.xwsReadmore.buildButtons({
-      icon: 'ui-icon-arrowstop-1-e',
-      wrapper: 'p.xwsReadMoreWrapper'
-    });
-  });
-// ]]>
-</script>
 
diff --git a/mod_xws_content/tmpl/scrollable-horizontal/default.php b/mod_xws_content/tmpl/scrollable-horizontal/default.php
@@ -45,7 +45,21 @@
  * ----------------------------------------------------------------------------- */
   modXwsContentHelper::loadJquery($params);
   modXwsContentHelper::loadJqueryTools($params);
-
+  $this->_doc->addScriptDeclaration("
+  // <![CDATA[
+    jQuery.noConflict();
+    jQuery(document).ready(function(){
+      jQuery('#xwsScrollableHoriontal" . $module->id . "').scrollable({
+        speed: 700,
+        circular: true
+      });
+      jQuery.xwsReadmore.buildButtons({
+        icon: 'ui-icon-arrowstop-1-e',
+        wrapper: 'p.xwsReadMoreWrapper'
+      });
+    });
+  // ]]>
+  ");
 ?>
 <?php
 /**
@@ -72,24 +86,4 @@
   </div>
 </div>
 <a class="next browse right"title="<?php echo JText::_('NEXT_SCROLLABLE_ITEM') ?>"></a>
-<?php
-/**
- * Setup javascript behavior for the layout
- */
-?>
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
-  jQuery.noConflict();
-  jQuery(document).ready(function(){
-    jQuery('#xwsScrollableHoriontal<?php echo $module->id ?>').scrollable({
-      speed: 700,
-      circular: true
-    });
-    jQuery.xwsReadmore.buildButtons({
-      icon: 'ui-icon-arrowstop-1-e',
-      wrapper: 'p.xwsReadMoreWrapper'
-    });
-  });
-// ]]>
-</script>
 
diff --git a/mod_xws_content/tmpl/scrollable-vertical/default.php b/mod_xws_content/tmpl/scrollable-vertical/default.php
@@ -39,6 +39,20 @@
  * ----------------------------------------------------------------------------- */
   modXwsContentHelper::loadJquery($params);
   modXwsContentHelper::loadJqueryTools($params);
+  $this->_doc->addScriptDeclaration("
+  // <![CDATA[
+    jQuery.noConflict();
+    jQuery(document).ready(function(){
+      jQuery('#xwsScrollableVertical" . $module->id . "').scrollable({
+        vertical: true
+      });
+      jQuery.xwsReadmore.buildButtons({
+        icon: 'ui-icon-arrowstop-1-e',
+        wrapper: 'p.xwsReadMoreWrapper'
+      });
+    });
+  // ]]>
+  ");
 
 ?>
 <?php
@@ -79,23 +93,4 @@
   <?php endforeach; ?>
   </div>
 </div>
-<?php
-/**
- * Setup javascript behavior for the layout
- */
-?>
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
-  jQuery.noConflict();
-  jQuery(document).ready(function(){
-    jQuery('#xwsScrollableVertical<?php echo $module->id ?>').scrollable({
-      vertical: true
-    });
-    jQuery.xwsReadmore.buildButtons({
-      icon: 'ui-icon-arrowstop-1-e',
-      wrapper: 'p.xwsReadMoreWrapper'
-    });
-  });
-// ]]>
-</script>
 
diff --git a/mod_xws_content/tmpl/tabs/default.php b/mod_xws_content/tmpl/tabs/default.php
@@ -17,18 +17,30 @@
 /* No direct access to joomla filesystem
  * ----------------------------------------------------------------------------- */
   defined('_JEXEC') or die('Restricted access');
+
+/* Load jquery ui css assets
+ * ----------------------------------------------------------------------------- */
+  modXwsContentHelper::loadJqueryUiStylesheets($params);
+
 /**
  * Load javascript assets
  * jquery
  * jquery-ui & xwsUiHelpers
  * ----------------------------------------------------------------------------- */
   modXwsContentHelper::loadJquery($params);
   modXwsContentHelper::loadJqueryUi($params);
-
-/* Load jquery ui css assets
- * ----------------------------------------------------------------------------- */
-  modXwsContentHelper::loadJqueryUiStylesheets($params);
-
+  $this->_doc->addScriptDeclaration("
+  // <![CDATA[
+    jQuery.noConflict();
+    jQuery(document).ready(function(){
+      jQuery.xwsUiHelpers.enableTabs();
+      jQuery.xwsReadmore.buildButtons({
+        icon: 'ui-icon-arrowstop-1-e',
+        wrapper: 'p.xwsReadMoreWrapper'
+      });
+    });
+  // ]]>
+  ");
 ?>
 <div id = "xwsTabs<?php echo $module->id; ?>">
   <ul class=" <?php echo $params->get('moduleclass_sfx'); ?>">
@@ -49,21 +61,4 @@
     </div>
   <?php endforeach; ?>
 </div>
-<?php
-/**
- * Setup javascript behavior for the layout
- */
-?>
-<script type="text/javascript" language="javascript" charset="utf-8">
-  // <![CDATA[
-    jQuery.noConflict();
-    jQuery(document).ready(function(){
-      jQuery.xwsUiHelpers.enableTabs();
-      jQuery.xwsReadmore.buildButtons({
-        icon: 'ui-icon-arrowstop-1-e',
-        wrapper: 'p.xwsReadMoreWrapper'
-      });
-    });
-  // ]]>
-</script>