Browse Source

Evolution #351: V0.1 Extension firefox

Sevajol Bastien 12 years ago
parent
commit
84cc3e49e8

+ 4 - 0
app/config/routing.yml View File

44
 home_bis:
44
 home_bis:
45
   pattern:  /
45
   pattern:  /
46
   defaults: { _controller: MuzichHomeBundle:Home:index }
46
   defaults: { _controller: MuzichHomeBundle:Home:index }
47
+  
48
+#share_form:
49
+#  pattern:  /share-from/{url}
50
+#  defaults: { _controller: MuzichCoreBundle:Core:shareFrom }
47
 
51
 
48
 MuzichUserBundle:
52
 MuzichUserBundle:
49
   resource: "@MuzichUserBundle/Resources/config/routing.yml"
53
   resource: "@MuzichUserBundle/Resources/config/routing.yml"

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

27
     
27
     
28
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
28
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
29
     //$count_elements = count($elements);
29
     //$count_elements = count($elements);
30
-    
30
+        
31
     return array(
31
     return array(
32
       'search_tags_id'   => $search_object->getTags(),
32
       'search_tags_id'   => $search_object->getTags(),
33
       'ids_display'      => $search_object->getIdsDisplay(),
33
       'ids_display'      => $search_object->getIdsDisplay(),
38
       'search_form_name' => 'search',
38
       'search_form_name' => 'search',
39
       'network_public'   => $search_object->isNetworkPublic(),
39
       'network_public'   => $search_object->isNetworkPublic(),
40
       'elements'         => $elements,
40
       'elements'         => $elements,
41
-      //'display_more_button' => ($count_elements >= $this->container->getParameter('search_default_count'))?true:false
41
+      'from_url'         => $this->getRequest()->get('from_url')
42
     );
42
     );
43
   }
43
   }
44
   
44
   

+ 13 - 0
src/Muzich/HomeBundle/Resources/views/Home/index.html.twig View File

44
         'form'          : add_form, 
44
         'form'          : add_form, 
45
         'form_name'     : add_form_name
45
         'form_name'     : add_form_name
46
       } %}
46
       } %}
47
+            
48
+    {% if from_url %}
49
+      <script type="text/javascript">
50
+        $(document).ready(function(){
51
+          $('#element_add_box').slideDown("slow");
52
+          $('#element_add_link').hide();
53
+          $('form[name="search"]').slideUp();
54
+          $('img#form_add_loader').show();
55
+          $('input#element_add_url').val("{{ from_url }}");
56
+          $('form[name="add"]').submit();
57
+        });
58
+      </script>
59
+    {% endif %}
47
 
60
 
48
     </form>
61
     </form>
49
   </div>
62
   </div>