Validate article is not empty

htmgarcia · May 4, 2015 · be07b98 · be07b98
1 parent 0035f4a
commit be07b98
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/en-GB.mod_lastworks.ini b/en-GB.mod_lastworks.ini
@@ -25,7 +25,7 @@ MOD_LASTWORKS_JQUERY="Load jQuery"
 MOD_LASTWORKS_JQUERY_DESC="Load jQuery. Only when Alternative Layout need it and the template doesn't load."
 
 ; Module Layout
-MOD_LASTWORKS_NO_ARTICLES_FOUND="You don't have articles."
+MOD_LASTWORKS_NO_ARTICLES_FOUND="We don't find articles to show, or there is no category selected."
 MOD_LASTWORKS_READMORE="Read more"
 
 ; Isotope Alternative Layout

diff --git a/helper.php b/helper.php
@@ -71,7 +71,7 @@ public static function getCategoriesLW( $categories ){
         $db = JFactory::getDBO();
         $query = 'SELECT * FROM #__categories';
         $query .= ' WHERE published = 1';
-        
+
         //categories
         $query .= ' AND id IN(' . join( ',', $categories ) . ')';
 

diff --git a/mod_lastworks.php b/mod_lastworks.php
@@ -28,9 +28,11 @@
 $jqueryload         = $params->get('vgjquery', 0);
 
 //data
-$articles           = modLastWorksHelper::getArticlesLW( $categories, $filter, $orderingtype, $ordering, $limit );
 if( $categories ){
     $categories     = modLastWorksHelper::getCategoriesLW( $categories );
+    $articles       = modLastWorksHelper::getArticlesLW( $categories, $filter, $orderingtype, $ordering, $limit );
+}else{
+    $articles = null;
 }
 
 require JModuleHelper::getLayoutPath( 'mod_lastworks', $layout );
diff --git a/mod_lastworks.xml b/mod_lastworks.xml
@@ -10,10 +10,9 @@
     <version>2.4.0</version>
     <description>
         <![CDATA[
-        <img src='../modules/mod_lastworks/assets/icon.png' style='float:left; margin-right:10px;width:100px;height:100px;' />
-        Last Works. Show your articles as you wants. <br /><br />
+        Last Works. Show your articles as you wants.
         Add your own Alternative Layouts inside: <em>templates/yourtemplate/html/mod_lastworks/</em> and choose it editing the module in <b>Alternative Layout</b> param.  <br />
-        Info and support: <a href="http://htmgarcia.com" target='_blank'>www.htmgarcia.com</a>
+        Info and support: <a href="https://joomlatemplat.es/" target='_blank'>joomlatemplat.es</a>
         ]]>
     </description>
     <files>

diff --git a/tmpl/default.php b/tmpl/default.php
@@ -55,7 +55,7 @@
         }//.ARTICLE LOOP -->
 
     }else{
-        echo '<div class="alert alert-block">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
+        echo '<div class="lastworks-alert">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
     }
 
 echo '</div>';
diff --git a/tmpl/four-columns.php b/tmpl/four-columns.php
@@ -73,7 +73,7 @@
         echo '</div>';
 
     }else{
-        echo '<div class="alert alert-block">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
+        echo '<div class="lastworks-alert">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
     }
 
 echo '</div>';
diff --git a/tmpl/portfolio.php b/tmpl/portfolio.php
@@ -52,8 +52,8 @@
         echo '</div>';
 
     }else{// .A1
-    
-        echo '<p class="vg-alert">There are no articles for this module.</p>';
+
+        echo '<div class="lastworks-alert">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
 
     }// .A1 -->
 echo '</div>';

diff --git a/tmpl/three-columns.php b/tmpl/three-columns.php
@@ -73,7 +73,7 @@
         echo '</div>';
 
     }else{
-        echo '<div class="alert alert-block">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
+        echo '<div class="lastworks-alert">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
     }
 
 echo '</div>';
diff --git a/tmpl/two-columns.php b/tmpl/two-columns.php
@@ -73,7 +73,7 @@
         echo '</div>';
 
     }else{
-        echo '<div class="alert alert-block">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
+        echo '<div class="lastworks-alert">' . JText::_('MOD_LASTWORKS_NO_ARTICLES_FOUND') . '</div>';
     }
 
 echo '</div>';