fix add icons BT#12926

chamilo · Jun 21, 2017 · 6fe6e1a · 6fe6e1a
1 parent b82a2dd
commit 6fe6e1a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
@@ -4362,9 +4362,6 @@ div#chat-remote-video video {
   width: 100%;
 }
 /* CSS Forum */
-.forum {
-  border-color: #dddddd !important;
-}
 .forum .number-post{
   background-color: #F7F7F9;
   border: 1px solid #E1E1E1 ;

diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php
@@ -254,8 +254,10 @@ function hidecontent(content){
 
     // Step 4: We display all the forums in this category.
     $forum_count = 0;
-    foreach ($forum_list as $key => $forum) {
-        if ($forum['forum_category'] == $forum_category['cat_id']) {
+
+    foreach ($forum_list as $forum) {
+        if(!empty($forum['forum_category'])){
+            if ($forum['forum_category'] == $forum_category['cat_id']) {
             // The forum has to be showed if
             // 1.v it is a not a group forum (teacher and student)
             // 2.v it is a group forum and it is public (teacher and student)
@@ -501,6 +503,7 @@ function hidecontent(content){
             }
             echo $html;
         }
+        }
     }
     if (count($forum_list) == 0) {
         echo '<div class="alert alert-warning">'.get_lang('NoForumInThisCategory').'</div>';

diff --git a/main/img/icons/22/forum_blue.png b/main/img/icons/22/forum_blue.png
diff --git a/main/img/icons/22/forum_yellow.png b/main/img/icons/22/forum_yellow.png
diff --git a/main/img/icons/32/forum_group.png b/main/img/icons/32/forum_group.png