[Isocial-svn] SF.net SVN: isocial: [252] public/stylesheets/groupapp

[<di...@us...>]

Revision: 252
          http://isocial.svn.sourceforge.net/isocial/?rev=252&view=rev
Author:   dim0s77
Date:     2008-06-25 12:06:47 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
minor changes

Modified Paths:
--------------
    app/controllers/groupapp/group_controller.php
    app/locales/groupapp/group/ru.php
    app/views/groupapp/group/browse.tpl
    public/stylesheets/common/Layout.css
    public/stylesheets/groupapp/Group.css

Modified: app/controllers/groupapp/group_controller.php
===================================================================
--- app/controllers/groupapp/group_controller.php	2008-06-25 18:33:10 UTC (rev 251)
+++ app/controllers/groupapp/group_controller.php	2008-06-25 19:06:47 UTC (rev 252)
@@ -254,6 +254,8 @@
         if (!($this->all_groups_count = count($all_groups))) { return; }
         $all_group_types = $this->GroupappGroupType->find('all');        
         if ($all_group_types) {
+            $this->group_id = 2;
+            $this->subgroup_id = 0;
             foreach($all_group_types as $group_type) {
                 $gt = array("id" => $group_type->id, "parent_id" => $group_type->parent_id, "name" => $group_type->get('name'));
                 if ($group_type->parent_id == 0) {
@@ -262,10 +264,10 @@
                     if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) {
                         $this->subgroup_types[] = $gt;
                         if (isset($this->params['sg']) && is_numeric($this->params['sg'])) {
-                            $this->subgroup = $this->params['sg'];
+                            $this->subgroup_id = $this->params['sg'];
                         }
                     }
-                } else if ($group_type->parent_id == 1) {
+                } else if ($group_type->parent_id == 2) {
                     $this->subgroup_types[] = $gt;
                 }
             }

Modified: app/locales/groupapp/group/ru.php
===================================================================
--- app/locales/groupapp/group/ru.php	2008-06-25 18:33:10 UTC (rev 251)
+++ app/locales/groupapp/group/ru.php	2008-06-25 19:06:47 UTC (rev 252)
@@ -142,5 +142,6 @@
 
 $dictionary['Groups are not found'] = 'Ни одной группы не найдено';
 $dictionary['Create first group'] = 'Создать первую группу';
+$dictionary['All'] = 'Все';
 
 ?>

Modified: app/views/groupapp/group/browse.tpl
===================================================================
--- app/views/groupapp/group/browse.tpl	2008-06-25 18:33:10 UTC (rev 251)
+++ app/views/groupapp/group/browse.tpl	2008-06-25 19:06:47 UTC (rev 252)
@@ -3,6 +3,9 @@
 {?all_groups_count}
 <div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div>
 
+<div class="groups_list">
+<div class="container">
+
 <div class="two_column">
   <div class="right_small">
     <div class="right_content">
@@ -11,10 +14,15 @@
         <li><a href="/groupapp/group/browse?g={group_type-id?}">{group_type-name}</a></li>
       {end}
       </ul>
-      <ul>
+      <ul class="groups_list">
+        <? if ($subgroup_id == 0) { ?>
+        <li><strong>_{All}</strong></li>
+        <? } else { ?>
+        <li><a href="/groupapp/group/browse?g={group_id?}">_{All}</a></li>
+        <? } ?>
       {loop subgroup_types}
-        <? if (isset($subgroup) && $subgroup == $subgroup_type["id"]) { ?>
-        <li><b>{subgroup_type-name?}</b></li>
+        <? if ($subgroup_id == $subgroup_type["id"]) { ?>
+        <li><strong>{subgroup_type-name?}</strong></li>
         <? } else { ?>
         <li><a href="/groupapp/group/browse?g={subgroup_type-parent_id?}&sg={subgroup_type-id?}">{subgroup_type-name?}</a></li>
         <? } ?>
@@ -24,9 +32,6 @@
   </div>
 
   <div class="left_big">
-    <div class="groups_list">
-
-      <div class="container">
         {loop user_groups}
         <div class="row">
 
@@ -54,12 +59,13 @@
           <div class="clearfix"></div>
         </div>
         {end}
-      </div>
-
-    </div>
   </div>
-  
+  <div class="clearfix"></div>
 </div>
+
+</div>
+</div>
+
 {else}
 <div class="nogroups">
   _{Groups are not found}. <a href="/groupapp/group/create">_{Create first group}!</a>

Modified: public/stylesheets/common/Layout.css
===================================================================
--- public/stylesheets/common/Layout.css	2008-06-25 18:33:10 UTC (rev 251)
+++ public/stylesheets/common/Layout.css	2008-06-25 19:06:47 UTC (rev 252)
@@ -1,5 +1,4 @@
 #content .two_column {
-    background: #ffffff;
 }
 
 #content .two_column .left_small {

Modified: public/stylesheets/groupapp/Group.css
===================================================================
--- public/stylesheets/groupapp/Group.css	2008-06-25 18:33:10 UTC (rev 251)
+++ public/stylesheets/groupapp/Group.css	2008-06-25 19:06:47 UTC (rev 252)
@@ -139,7 +139,6 @@
 
 .groups_list {
     float: left;
-    background: #ffffff;
     width: 100%;
 }
 
@@ -178,6 +177,17 @@
     margin-bottom: 10px;
 }
 
+.groups_list ul {
+    list-style: none;
+    padding-left: 0px;
+    margin: 0px;
+}
+
+.groups_list li {
+    display: block;
+    padding: 5px 10px 5px 10px;
+}
+
 .other {
     float: left;
     margin-bottom: 3px;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.