Browse Source

Evolution #554: Design

Bastien Sevajol 12 years ago
parent
commit
b753106cbf

+ 1 - 1
src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig View File

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

+ 2 - 2
src/Muzich/CoreBundle/Resources/views/layout.html.twig View File

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

+ 9 - 0
src/Muzich/CoreBundle/Searcher/ElementSearcher.php View File

358
     return false;
358
     return false;
359
   }
359
   }
360
   
360
   
361
+  public function setNetwork($network)
362
+  {
363
+    if (!in_array($network, array(self::NETWORK_PERSONAL, self::NETWORK_PUBLIC)))
364
+    {
365
+      throw new \Exception("Wrong network set");
366
+    }
367
+    $this->network = $network;
368
+  }
369
+  
361
 }
370
 }

+ 2 - 2
src/Muzich/HomeBundle/Controller/HomeController.php View File

15
    * 
15
    * 
16
    * @Template()
16
    * @Template()
17
    */
17
    */
18
-  public function indexAction($count = null)
18
+  public function indexAction($count = null, $network = 'public')
19
   {
19
   {
20
     $search_object = $this->getElementSearcher($count);
20
     $search_object = $this->getElementSearcher($count);
21
     $user = $this->getUser(true, array('join' => array(
21
     $user = $this->getUser(true, array('join' => array(
22
       'groups_owned'
22
       'groups_owned'
23
     )), true);
23
     )), true);
24
-    
24
+    $search_object->setNetwork($network);
25
     $search_form = $this->getSearchForm($search_object);
25
     $search_form = $this->getSearchForm($search_object);
26
     $add_form = $this->getAddForm();
26
     $add_form = $this->getAddForm();
27
     
27
     

+ 1 - 1
src/Muzich/HomeBundle/Resources/config/routing.yml View File

2
 
2
 
3
 home:
3
 home:
4
   pattern:  /
4
   pattern:  /
5
-  defaults: { _controller: MuzichHomeBundle:Home:index }
5
+  defaults: { _controller: MuzichHomeBundle:Home:index, network: network_public }
6
   
6
   
7
 home_more:
7
 home_more:
8
   pattern:  /more/{count}
8
   pattern:  /more/{count}

+ 5 - 2
src/Muzich/MynetworkBundle/Resources/config/routing.yml View File

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

+ 2 - 2
web/css/main.css View File

1235
   color: black;
1235
   color: black;
1236
 }
1236
 }
1237
 
1237
 
1238
-div.search_tag_list ul.search_tag_list li.new a
1238
+#container div.search_tag_list ul.search_tag_list li.new a
1239
 {
1239
 {
1240
   color: black;
1240
   color: black;
1241
 }
1241
 }
1269
 }
1269
 }
1270
 
1270
 
1271
 
1271
 
1272
-div#search_tag_search a.more
1272
+div#search_tag_search a.more, div#search_tag_add a.more
1273
 {
1273
 {
1274
   color: black;
1274
   color: black;
1275
 }
1275
 }