Browse Source

Evolution #541: Javascript and CSS assets

Sevajol Bastien 11 years ago
parent
commit
444cee1960

BIN
app/Resources/java/yuicompressor-2.4.8pre.jar View File


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

@@ -29,3 +29,7 @@ _configurator:
29 29
 
30 30
 _main:
31 31
     resource: routing.yml
32
+
33
+_assetic:
34
+    resource: .
35
+    type:     assetic

web/js/lib/TagPrompt.js → src/Muzich/CoreBundle/Resources/public/js/TagPrompt.js View File

@@ -1,6 +1,6 @@
1 1
 function TagPrompt(select_tag_callback, tag_prompt_connector)
2 2
 {
3
-  
3
+  // En plus je change une ligne !
4 4
   /* @var tags_selected array of Tag */
5 5
   var tags_selected = [];
6 6
   /* @var tags_proposed array of Tag */

web/js/lib/autoplay.js → src/Muzich/CoreBundle/Resources/public/js/autoplay.js View File


web/js/lib/muzich.js → src/Muzich/CoreBundle/Resources/public/js/muzich.js View File

@@ -690,7 +690,7 @@ $(document).ready(function(){
690 690
       // On prépare le tagBox
691 691
       li.html(response.html);
692 692
       // Pour le click sur l'input de saisie de tag
693
-      li.find('ul.tagbox li.input input[type="text"]').formDefaults();
693
+      //li.find('ul.tagbox li.input input[type="text"]').formDefaults();
694 694
      
695 695
       var options = new Array();
696 696
       options.form_name  = response.form_name;
@@ -2200,7 +2200,7 @@ $(document).ready(function(){
2200 2200
         table.after(response.html);
2201 2201
 
2202 2202
         // Pour le click sur l'input de saisie de tag
2203
-        li.find('ul.tagbox li.input input[type="text"]').formDefaults();
2203
+        //li.find('ul.tagbox li.input input[type="text"]').formDefaults();
2204 2204
 
2205 2205
         var options = new Array();
2206 2206
         options.form_name  = response.form_name;

+ 8 - 3
src/Muzich/CoreBundle/Resources/views/Layout/head_css.html.twig View File

@@ -1,7 +1,12 @@
1 1
 <link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon" />
2
-<link href="{{ asset('bundles/muzichcore/css/base.css') }}" rel="stylesheet" media="screen" type="text/css" />
3
-<link href="{{ asset('bundles/muzichcore/css/old.css') }}" rel="stylesheet" media="screen" type="text/css" />
4
-<link href="{{ asset('css/main.css') }}" rel="stylesheet" media="screen" type="text/css" />
2
+
3
+{% stylesheets
4
+  'jplayer/skin/blue.monday/jplayer.blue.monday.css'
5
+  'bundles/muzichcore/css/base.css'
6
+  'bundles/muzichcore/css/old.css'
7
+  'css/main.css' %}{# filter='yui_css' %}#}
8
+  <link rel="stylesheet" href="{{ asset_url }}" />
9
+{% endstylesheets %}
5 10
 
6 11
 <!--[if gte IE 9]>
7 12
   <style type="text/css">

+ 15 - 27
src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig View File

@@ -1,31 +1,19 @@
1
+{% javascripts
2
+  'js/jquery-1.8.2.prod.js'
3
+  'js/jquery-ui-1.8.7.min.js'
4
+  'js/swfobject.js'
5
+  'js/soundcloud/api.js'
6
+  'js/soundcloud/sdk.js'
7
+  'jplayer/js/jquery.jplayer.min.js'
8
+  'jplayer/js/jplayer.playlist.min.js'
9
+  'js/jquery.form-2.14.js'
10
+  'js/jConfirmAction/jconfirmaction.jquery.js'
11
+  '@MuzichCoreBundle/Resources/public/js/TagPrompt.js'
12
+  '@MuzichCoreBundle/Resources/public/js/autoplay.js'
13
+  '@MuzichCoreBundle/Resources/public/js/muzich.js' %}{# filter='yui_js' %}#}
14
+  <script src="{{ asset_url }}"></script>
15
+{% endjavascripts %}
1 16
 
2
-{% if  app.environment != 'prod' %}  
3
-  <script src="{{ asset('js/jquery-1.8.2.dev.js') }}" type="text/javascript"></script>
4
-{% else %}
5
-  <script src="{{ asset('js/jquery-1.8.2.prod.js') }}" type="text/javascript"></script>
6
-{% endif %}
7
-
8
-<script src="{{ asset('js/jquery-ui-1.8.7.min.js') }}" type="text/javascript"></script>
9
-<script src="{{ asset('js/lib/muzich.js') }}" type="text/javascript"></script>
10
-<script src="{{ asset('js/lib/TagPrompt.js') }}" type="text/javascript"></script>
11
-
12
-<script type="text/javascript" src="{{ asset('js/swfobject.js') }}"></script> 
13
-
14
-<script src="http://connect.soundcloud.com/sdk.js"></script>
15
-<script src="http://w.soundcloud.com/player/api.js"></script>
16
-
17
-<script src="{{ asset('js/lib/autoplay.js') }}" type="text/javascript"></script>
18
-
19
-{# jPlayer #}
20
-<link href="{{ asset('jplayer/skin/blue.monday/jplayer.blue.monday.css') }}" rel="stylesheet" type="text/css" />
21
-<script type="text/javascript" src="{{ asset('jplayer/js/jquery.jplayer.min.js') }}"></script>
22
-<script type="text/javascript" src="{{ asset('jplayer/js/jplayer.playlist.min.js') }}"></script>
23
-
24
-<script src="{{ asset('js/tags/jquery.autoGrowInput.js') }}" type="text/javascript"></script>
25
-<script src="{{ asset('js/tags/jquery.tagBox.js') }}" type="text/javascript"></script>
26
-<script src="{{ asset('js/formdefault/jquery.formdefaults.js') }}" type="text/javascript"></script>
27
-<script src="{{ asset('js/jquery.form-2.14.js') }}" type="text/javascript"></script>
28
-<script src="{{ asset('js/jConfirmAction/jconfirmaction.jquery.js') }}" type="text/javascript"></script>
29 17
 <script type="text/javascript">
30 18
   string_follow_stop = "{{ 'user.stop_follow'|trans({}, 'users') }}";
31 19
   string_follow_following = "{{ 'user.following'|trans({}, 'users') }}";

File diff suppressed because it is too large
+ 1 - 0
web/js/soundcloud/api.js


File diff suppressed because it is too large
+ 1 - 0
web/js/soundcloud/sdk.js