Ver código fonte

Update img/js/css paths

jmontoyaa 8 anos atrás
pai
commit
f7ed87088b

+ 53 - 53
app/Resources/public/css/base.css

@@ -316,7 +316,7 @@ header{
   margin-right: 10px;
 }
 .button-load{
-  background: url("../../main/img/icons/64/file_upload.png") no-repeat center 20px;
+  background: url("../img/icons/64/file_upload.png") no-repeat center 20px;
   padding-top: 70px;
 }
 #results .file_upload_highlight {
@@ -551,10 +551,10 @@ header{
     margin-left: 25px;
 }
 #exercise-description .panel-heading a{
-    background: url("../../main/img/icons/22/arrow-up-collapse.png") no-repeat left center;
+    background: url("../img/icons/22/arrow-up-collapse.png") no-repeat left center;
 }
 #exercise-description .panel-heading a.collapsed{
-    background: url("../../main/img/icons/22/arrow-down-collapse.png") no-repeat left center;
+    background: url("../img/icons/22/arrow-down-collapse.png") no-repeat left center;
 }
 /*****************************************************
  *              AGENDA                               *
@@ -2097,7 +2097,7 @@ div.admin_section h4 {
     padding: 5px;
     text-align: center;
     margin-bottom: 10px;
-    background: url(../../main/img/clock-exercise.png) no-repeat center center #FFF;
+    background: url(../img/clock-exercise.png) no-repeat center center #FFF;
     border: 1px solid #DDD;
     border-radius: 5px;
 }
@@ -2105,12 +2105,12 @@ div.admin_section h4 {
     border-radius: 0px;
 }
 .time_warning_two {
-    background: url(../../main/img/clock-exercise.png) no-repeat center center #FFD700;
+    background: url(../img/clock-exercise.png) no-repeat center center #FFD700;
     border:1px solid #FFCC00;
     color: #C00;
 }
 .time_warning_one {
-    background: url(../../main/img/clock-exercise.png) no-repeat center center #FB3A35;
+    background: url(../img/clock-exercise.png) no-repeat center center #FB3A35;
     border:1px solid #FB3A35;
     color: #FFF;
 }
@@ -2410,7 +2410,7 @@ form .formw .freeze {
   padding-bottom: 1em;
 }
 .skill-options .skill-winner li a{
-  background: url("../../main/img/icons/16/winner.png") no-repeat;
+  background: url("../img/icons/16/winner.png") no-repeat;
   padding-left: 1.5em;
   padding-bottom: 1em;
 }
@@ -2737,7 +2737,7 @@ div#no-data-view div.controls {
     height: 25px;
     position: relative;
     overflow:hidden;
-    background: url(../../main/img/alt_star.png) top left repeat-x;
+    background: url(../img/alt_star.png) top left repeat-x;
 }
 .star-rating li{
     padding:0px;
@@ -2759,7 +2759,7 @@ div#no-data-view div.controls {
     overflow:hidden;
 }
 .star-rating li a:hover{
-    background: url(../../main/img/alt_star.png) left bottom;
+    background: url(../img/alt_star.png) left bottom;
     z-index: 2;
     left: 0px;
     border:none;
@@ -2795,7 +2795,7 @@ div#no-data-view div.controls {
     width: 125px;
 }
 .star-rating li.current-rating{
-    background: url(../../main/img/alt_star.png) left center;
+    background: url(../img/alt_star.png) left center;
     position: absolute;
     height: 25px;
     display: block;
@@ -2820,14 +2820,14 @@ a:active{
     border: 0px;
 }
 .send_msg_in_text {
-    background: url("../../main/img/mail_send.png") no-repeat scroll right center transparent;
+    background: url("../img/mail_send.png") no-repeat scroll right center transparent;
     height: 16px;
     width: 17px;
     display: inline-block;
     margin-right: 4px;
 }
 .send_inv_in_text {
-    background: url("../../main/img/invitation.png") no-repeat scroll right center transparent;
+    background: url("../img/invitation.png") no-repeat scroll right center transparent;
     height: 16px;
     width: 17px;
     display: inline-block;
@@ -3197,35 +3197,35 @@ a.forum_group_link {
     margin-bottom: 10px;
 }
 .handle{
-    background-image: url('../../main/img/div_show.gif');
+    background-image: url('../img/div_show.gif');
     background-repeat: no-repeat;
     background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
 .handle.collapsed{
-    background-image:  url('../../main/img/div_show.gif');
+    background-image:  url('../img/div_show.gif');
     background-repeat: no-repeat;
     background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
 .handle.expanded{
-    background-image:  url('../../main/img/div_hide.gif');
+    background-image:  url('../img/div_hide.gif');
     background-repeat: no-repeat;
     background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
 .collapsible .handle{
-    background-image: url('../../main/img/div_hide.gif');
+    background-image: url('../img/div_hide.gif');
     background-repeat: no-repeat;
     background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
 .collapsible .handle.collapsed{
-    background-image:  url('../../main/img/div_show.gif');
+    background-image:  url('../img/div_show.gif');
     background-repeat: no-repeat;
     background-position:left center;
     padding-left: 25px;
@@ -3233,7 +3233,7 @@ a.forum_group_link {
 }
 
 .collapsible.expanded .handle{
-    background-image:  url('../../main/img/div_hide.gif');
+    background-image:  url('../img/div_hide.gif');
     background-repeat: no-repeat;
     background-position:left center;
     padding-left: 25px;
@@ -3248,7 +3248,7 @@ a.forum_group_link {
     margin:0;
     padding:0;
     display:inline-block;
-    background-image:  url('../../main/img/icons/22/invisible.png');
+    background-image:  url('../img/icons/22/invisible.png');
     background-repeat: no-repeat;
     background-position:center center;
     box-shadow:none;
@@ -3262,7 +3262,7 @@ a.forum_group_link {
     width:22px;
     height:22px;
     display:inline-block;
-    background-image:  url('../../main/img/icons/22/visible.png');
+    background-image:  url('../img/icons/22/visible.png');
     background-repeat: no-repeat;
     background-position:center center;
     box-shadow:none;
@@ -3276,7 +3276,7 @@ a.forum_group_link {
     margin:0;
     padding:0;
     display:inline-block;
-    background-image:  url('../../main/img/loading1.gif') !important;
+    background-image:  url('../img/loading1.gif') !important;
     background-repeat: no-repeat;
     background-position:center center;
     box-shadow:none;
@@ -3316,11 +3316,11 @@ a.forum_group_link {
 */
 
 i.size-32.icon-new-glossary-term{
-    background-image:  url('../../main/img/icons/32/new_glossary_term.png');
+    background-image:  url('../img/icons/32/new_glossary_term.png');
 }
 
 i.size-32.icon-new-note{
-    background-image:  url('../../main/img/icons/32/new_note.png');
+    background-image:  url('../img/icons/32/new_note.png');
 }
 /* Data table */
 
@@ -3359,13 +3359,13 @@ i.size-32.icon-new-note{
 
 .dataTables_wrapper .paginate_disabled_previous, .dataTables_wrapper .paginate_enabled_previous {
     padding-left: 23px;
-    background: url("../../main/img/action_prev.png") no-repeat scroll left top;
+    background: url("../img/action_prev.png") no-repeat scroll left top;
 }
 
 .dataTables_wrapper .paginate_disabled_next, .dataTables_wrapper .paginate_enabled_next {
     margin-left: 10px;
     padding-right: 23px;
-    background: url("../../main/img/action_next.png") no-repeat scroll left top;
+    background: url("../img/action_next.png") no-repeat scroll left top;
 }
 
 .dataTables_wrapper .paginate_disabled_previous, .dataTables_wrapper .paginate_disabled_next{
@@ -3373,14 +3373,14 @@ i.size-32.icon-new-note{
 }
 
 .dataTables_wrapper .sorting_asc {
-    background-image: url("../../main/img/sort_asc.png");
+    background-image: url("../img/sort_asc.png");
     background-repeat: no-repeat;
     background-attachment: scroll;
     background-position: right center;
 }
 
 .dataTables_wrapper .sorting_desc{
-    background-image: url("../../main/img/sort_desc.png");
+    background-image: url("../img/sort_desc.png");
     background-repeat: no-repeat;
     background-attachment: scroll;
     background-position: right center;
@@ -3395,27 +3395,27 @@ i.size-32.icon-new-note{
         padding: 10px 0px 10px 40px;
         background-repeat:no-repeat;
     }
-    select#question_type_hidden option[value="1"] {background-image: url(../../main/img/icons/32/mcua.png);}
-    select#question_type_hidden option[value="2"] {background-image: url(../../main/img/icons/32/mcma.png);}
-    select#question_type_hidden option[value="3"] {background-image: url(../../main/img/icons/32/fill_in_blanks.png);}
-    select#question_type_hidden option[value="4"] {background-image: url(../../main/img/icons/32/matching.png);}
-    select#question_type_hidden option[value="5"] {background-image: url(../../main/img/icons/32/open_answer.png);}
-    select#question_type_hidden option[value="6"] {background-image: url(../../main/img/icons/32/hotspot.png);}
-    select#question_type_hidden option[value="7"] {background-image: url(../../main/img/icons/32/mcma.png);}
-    select#question_type_hidden option[value="8"] {background-image: url(../../main/img/icons/32/mcma.png);}
-    select#question_type_hidden option[value="9"] {background-image: url(../../main/img/icons/32/mcmac.png);}
-    select#question_type_hidden option[value="10"] {background-image: url(../../main/img/icons/32/mcuao.png);}
-    select#question_type_hidden option[value="11"] {background-image: url(../../main/img/icons/32/mcmao.png);}
-    select#question_type_hidden option[value="12"] {background-image: url(../../main/img/icons/32/mcmaco.png);}
-    select#question_type_hidden option[value="13"] {background-image: url(../../main/img/icons/32/audio_question.png);}
-    select#question_type_hidden option[value="14"] {background-image: url(../../main/img/icons/32/mcmagl.png);}
-    select#question_type_hidden option[value="16"] {background-image: url(../../main/img/icons/32/calculated_answer.png);}
+    select#question_type_hidden option[value="1"] {background-image: url(../img/icons/32/mcua.png);}
+    select#question_type_hidden option[value="2"] {background-image: url(../img/icons/32/mcma.png);}
+    select#question_type_hidden option[value="3"] {background-image: url(../img/icons/32/fill_in_blanks.png);}
+    select#question_type_hidden option[value="4"] {background-image: url(../img/icons/32/matching.png);}
+    select#question_type_hidden option[value="5"] {background-image: url(../img/icons/32/open_answer.png);}
+    select#question_type_hidden option[value="6"] {background-image: url(../img/icons/32/hotspot.png);}
+    select#question_type_hidden option[value="7"] {background-image: url(../img/icons/32/mcma.png);}
+    select#question_type_hidden option[value="8"] {background-image: url(../img/icons/32/mcma.png);}
+    select#question_type_hidden option[value="9"] {background-image: url(../img/icons/32/mcmac.png);}
+    select#question_type_hidden option[value="10"] {background-image: url(../img/icons/32/mcuao.png);}
+    select#question_type_hidden option[value="11"] {background-image: url(../img/icons/32/mcmao.png);}
+    select#question_type_hidden option[value="12"] {background-image: url(../img/icons/32/mcmaco.png);}
+    select#question_type_hidden option[value="13"] {background-image: url(../img/icons/32/audio_question.png);}
+    select#question_type_hidden option[value="14"] {background-image: url(../img/icons/32/mcmagl.png);}
+    select#question_type_hidden option[value="16"] {background-image: url(../img/icons/32/calculated_answer.png);}
 }
 /*
  * work
  */
 i.size-32.icon-new-work{
-    background-image:  url('../../main/img/icons/32/new_work.png');
+    background-image:  url('../img/icons/32/new_work.png');
 }
 
 /* Default skill partition colors */
@@ -4114,10 +4114,10 @@ ul.holder li.bit-box{
   font-size: 12px;
 }
 #thematic .arrow{
-    background: url("../../main/img/icons/22/arrow-up-collapse.png") no-repeat 99% center;
+    background: url("../img/icons/22/arrow-up-collapse.png") no-repeat 99% center;
 }
 #thematic .arrow.collapsed{
-    background: url("../../main/img/icons/22/arrow-down-collapse.png") no-repeat 99% center;
+    background: url("../img/icons/22/arrow-down-collapse.png") no-repeat 99% center;
 }
 .question_options .exercise-unique-answer-image .radio{
   padding-left: 10px;
@@ -4457,18 +4457,18 @@ div#chat-remote-video video {
   display: inline-block;
   width: 125px;
   padding: 5px;
-  /* background: url("../../main/img/icons/48/sequence-arrow.png") no-repeat center bottom; */
+  /* background: url("../img/icons/48/sequence-arrow.png") no-repeat center bottom; */
 }
 #parents .sequence-plus-icon{
   color: #CCCCCC;
   padding: 0 10px;
 }
 .border-sequence{
-  background: url("../../main/img/line.png") repeat-x 0 35px;
+  background: url("../img/line.png") repeat-x 0 35px;
 }
 .arrow-sequence{
   height: 68px;
-  background: url("../../main/img/icons/48/sequence-arrow.png") no-repeat center 15px;
+  background: url("../img/icons/48/sequence-arrow.png") no-repeat center 15px;
   margin-top: 10px;
   padding-top: 10px;
 }
@@ -5475,7 +5475,7 @@ a.sessionView {
 }
 #chat-video-panel .thumbnail video {
   background-color: #FFF;
-  background-image: url("../../main/img/icons/128/camera-webrtc.png");
+  background-image: url("../img/icons/128/camera-webrtc.png");
   background-position: center center;
   background-repeat: no-repeat;
   display: block;
@@ -5557,7 +5557,7 @@ a.sessionView {
     overflow: hidden;
     margin: 20px auto;
     position: relative;
-    background: url('../../main/img/timeline/dot.gif') left 45px repeat-x;
+    background: url('../img/timeline/dot.gif') left 45px repeat-x;
 }
 #dates {
     width: 800px;
@@ -5571,7 +5571,7 @@ a.sessionView {
     height: 50px;
     font-size: 16px;
     text-align: center;
-    background: url('../../main/img/timeline/biggerdot.png') center bottom no-repeat;
+    background: url('../img/timeline/biggerdot.png') center bottom no-repeat;
 }
 #dates a {
     line-height: 38px;
@@ -5662,11 +5662,11 @@ a.sessionView {
 }
 #next {
     right: 0;
-    background-image: url('../../main/img/timeline/next.png');
+    background-image: url('../img/timeline/next.png');
 }
 #prev {
     left: 0;
-    background-image: url('../../main/img/timeline/prev.png');
+    background-image: url('../img/timeline/prev.png');
 }
 #next.disabled,
 #prev.disabled {

+ 4 - 4
main/document/document_quota.php

@@ -17,10 +17,10 @@ $tool_name = get_lang('DocumentQuota');
 
 $interbreadcrumb[] = array('url' => 'document.php', 'name' => get_lang('Documents'));
 
-$htmlHeadXtra[] = api_get_js('jqplot/jquery.jqplot.js');
-$htmlHeadXtra[] = api_get_js('jqplot/plugins/jqplot.pieRenderer.js');
-$htmlHeadXtra[] = api_get_js('jqplot/plugins/jqplot.donutRenderer.js');
-$htmlHeadXtra[] = api_get_css('jqplot/jquery.jqplot.css');
+$htmlHeadXtra[] = api_get_js('js/jqplot/jquery.jqplot.js');
+$htmlHeadXtra[] = api_get_js('js/jqplot/plugins/jqplot.pieRenderer.js');
+$htmlHeadXtra[] = api_get_js('js/jqplot/plugins/jqplot.donutRenderer.js');
+$htmlHeadXtra[] = api_get_css('js/jqplot/jquery.jqplot.css');
 $course_code = api_get_course_id();
 $course_id = api_get_course_int_id();
 $session_id = api_get_session_id();

+ 8 - 9
main/document/showinframes.php

@@ -187,11 +187,11 @@ $js_glossary_in_documents =	'
   {
     load: [
         { type:"script", id:"_fr1", src:"'.api_get_jquery_web_path().'"},
-        { type:"script", id:"_fr7", src:"'.api_get_path(WEB_PATH).'web/assets/MathJax/MathJax.js?config=AM_HTMLorMML"},
-        { type:"script", id:"_fr4", src:"'.api_get_path(WEB_PATH).'web/assets/jquery-ui/jquery-ui.min.js"},
-        { type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_PATH).'web/assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
-        { type:"stylesheet", id:"_fr6", src:"'.api_get_path(WEB_PATH).'web/assets/jquery-ui/themes/smoothness/theme.css"},
-        { type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_JS_PATH).'jquery.highlight.js"},
+        { type:"script", id:"_fr7", src:"'.api_get_asset('MathJax/MathJax.js', true).'?config=AM_HTMLorMML"},
+        { type:"script", id:"_fr4", src:"'.api_get_asset('jquery-ui/jquery-ui.min.js', true).'"},
+        { type:"stylesheet", id:"_fr5", src:"'.api_get_asset('jquery-ui/themes/smoothness/jquery-ui.min.css', true).'"},
+        { type:"stylesheet", id:"_fr6", src:"'.api_get_asset('jquery-ui/themes/smoothness/theme.css', true).'"},
+        { type:"script", id:"_fr2", src:"'.api_get_js('js/jquery.highlight.js', true).'"},
         { type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php"}
     ]
   });';
@@ -255,9 +255,8 @@ if ($jplayer_supported) {
     if ($extension == 'mp4')  {
         $extension = 'm4v';
     }
-    $js_path = api_get_path(WEB_LIBRARY_JS_PATH);
-    $htmlHeadXtra[] = '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
-    $htmlHeadXtra[] = '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
+    $htmlHeadXtra[] = api_get_css('js/jquery-jplayer/skin/chamilo/jplayer.blue.monday.css');
+    $htmlHeadXtra[] = api_get_js('js/jquery-jplayer/jplayer/jquery.jplayer.min.js');
 
     $jquery = '
         $("#jquery_jplayer_1").jPlayer({
@@ -267,7 +266,7 @@ if ($jplayer_supported) {
                 });
             },
             cssSelectorAncestor: "#jp_container_1",
-            swfPath: "'.$js_path.'jquery-jplayer/jplayer/",
+            swfPath: "'.api_get_js('jquery-jplayer/jplayer/', true).'",
             supplied: "'.$extension.'",
             useStateClassSkin: true,
             autoBlur: false,

+ 1 - 1
main/inc/lib/formvalidator/FormValidator.class.php

@@ -904,7 +904,7 @@ EOT;
         $id = $this->getAttribute('id');
 
         $this->updateAttributes("onsubmit=\"javascript: addProgress('" . $id . "')\"");
-        $this->addHtml('<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'upload.js" type="text/javascript"></script>');
+        $this->addHtml(api_get_js('js/upload.js'));
     }
 
     /**

+ 2 - 2
src/Chamilo/UserBundle/Resources/views/layout.html.twig

@@ -1,6 +1,6 @@
 {% extends '@ChamiloTheme/Layout/login-layout.html.twig' %}
 
 {% block page_content %}
-    {% block fos_user_content %}
-    {% endblock %}
+{% block fos_user_content %}
+{% endblock %}
 {% endblock %}

BIN
web/img/file_html.gif


BIN
web/img/folder_learningpath.gif


BIN
web/img/progress_bar.gif


BIN
web/img/shared.png