Evolution #554: Design

src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig

@@ -8,7 +8,7 @@
       </a>
     </li>
     <li {% if active == 'private' %} class="active" {% endif %}>
-      <a href="{{ path('mynetwork_index') }}">
+      <a href="{{ path('mynetwork_home') }}">
         {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
       </a>
     </li>

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -33,7 +33,7 @@
     <script src="{{ asset('js/lib/TagPrompt.js') }}" type="text/javascript"></script>
 
     <script type="text/javascript" src="{{ asset('js/swfobject.js') }}"></script> 
-    {# TODO: On peux piquer les js ?  #}
+    
     <script src="http://connect.soundcloud.com/sdk.js"></script>
     <script src="http://w.soundcloud.com/player/api.js"></script>
 
@@ -229,7 +229,7 @@
             </li>
             <li class="separator"></li>
             <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
-              <a href="{{ path('home') }}" class="my_network" >
+              <a href="{{ path('mynetwork_home') }}" class="my_network" >
                 {{ 'filter.network_my'|trans({}, 'userui') }}
               </a>
             </li>

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -358,4 +358,13 @@ class ElementSearcher extends Searcher implements SearcherInterface
     return false;
   }
   
+  public function setNetwork($network)
+  {
+    if (!in_array($network, array(self::NETWORK_PERSONAL, self::NETWORK_PUBLIC)))
+    {
+      throw new \Exception("Wrong network set");
+    }
+    $this->network = $network;
+  }
+  
 }

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -15,13 +15,13 @@ class HomeController extends Controller
    * 
    * @Template()
    */
-  public function indexAction($count = null)
+  public function indexAction($count = null, $network = 'public')
   {
     $search_object = $this->getElementSearcher($count);
     $user = $this->getUser(true, array('join' => array(
       'groups_owned'
     )), true);
-    
+    $search_object->setNetwork($network);
     $search_form = $this->getSearchForm($search_object);
     $add_form = $this->getAddForm();
     

src/Muzich/HomeBundle/Resources/config/routing.yml

@@ -2,7 +2,7 @@
 
 home:
   pattern:  /
-  defaults: { _controller: MuzichHomeBundle:Home:index }
+  defaults: { _controller: MuzichHomeBundle:Home:index, network: network_public }
   
 home_more:
   pattern:  /more/{count}

src/Muzich/MynetworkBundle/Resources/config/routing.yml

@@ -1,6 +1,9 @@
 mynetwork_index:
   pattern:  /my-network/{event_id}
-  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:index, event_id: null }
+  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:index }
   requirements:
     event_id:  \d+
-  
+  
+mynetwork_home:
+  pattern:  /my-network
+  defaults: { _controller: MuzichHomeBundle:Home:index, network: network_personal }

web/css/main.css

@@ -1235,7 +1235,7 @@ div.search_tag_list ul.search_tag_list li.new
   color: black;
 }
 
-div.search_tag_list ul.search_tag_list li.new a
+#container div.search_tag_list ul.search_tag_list li.new a
 {
   color: black;
 }
@@ -1269,7 +1269,7 @@ ul.search_tag_list li a
 }
 
 
-div#search_tag_search a.more
+div#search_tag_search a.more, div#search_tag_add a.more
 {
   color: black;
 }