Move main/css to app/Resources/public/css see #7522

.travis.yml

@@ -40,7 +40,7 @@ before_script:
   - cp chamilo-cli-install/chamilo-cli-installer.php main/install/
   - mysql -u root -e 'create database chamilo'
   # install Chamilo with Chash - see reference https://github.com/sonnym/travis-ci-drupal-module-example/blob/master/.travis.yml
-  - sudo chmod -R 0777 app/config app/cache app/courses home app/upload/ main/default_course_document/images main/lang main/css
+  - sudo chmod -R 0777 app/config app main/default_course_document/images main/lang
   - cd main/install/
   - sudo php5 chamilo-cli-installer.php -l admin -p admin -U travis -u 'http://localhost/' -X travis -L english -z 'admin@example.com' -f 'John' -g 'Doe' -b '555-5555' -c 'Test campus' -y 'Chamilo' -x 'https://chamilo.org'
   - cd ../..

README.md

@@ -59,7 +59,7 @@ composer update
 
 On a Debian-based system, launch:
 ```
-sudo chown -R www-data:www-data app/cache app/config app/course home app/upload main/default_course_document/images main/lang main/css 
+sudo chown -R www-data:www-data app main/default_course_document/images main/lang  
 ```
 
 ### Start the installer

app/Resources/public/css/csshover3.htc

@@ -1,14 +1,14 @@
-<public:attach event="ondocumentready" onevent="CSSHover()" />
-<script>
-/**
- *	Whatever:hover - V3.00.081222
- *	--------------------------------------------------------
- *	Author  - Peter Nederlof, http://www.xs4all.nl/~peterned
- *	License - http://creativecommons.org/licenses/LGPL/2.1
- *	Packed  - http://dean.edwards.name/packer
- *
- *	howto: body { behavior:url("csshover3.htc"); }
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('r.R=(8(){4 f=/(^|\\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(C|D|E))/i,S=/(.*?)\\:(C|D|E)/i,T=/[^:]+:([a-z-]+).*/i,U=/(\\.([a-V-W-]+):[a-z]+)|(:[a-z]+)/1c,X=/\\.([a-V-W-]*Y(C|D|E))/i,Z=/1d (5|6|7)/i,10=/1e/i;4 g=\'1f-\';4 h={p:[],t:{},11:8(){n(!Z.F(1g.1h)&&!10.F(r.12.1i))u;4 a=r.12.1j,l=a.v;w(4 i=0;i<l;i++){3.G(a[i])}},G:8(a){n(a.H){I{4 b=a.H,l=b.v;w(4 i=0;i<l;i++){3.G(a.H[i])}}J(13){}}I{4 c=a.1k,l=c.v;w(4 j=0;j<l;j++){3.14(c[j],a)}}J(13){}},14:8(a,b){4 c=a.1l;n(f.F(c)){4 d=a.K.1m,L=S.15(c)[1],M=c.N(T,\'Y$1\'),O=c.N(U,\'.$2\'+M),o=X.15(O)[1];4 e=L+o;n(!3.t[e]){b.16(L,g+o+\':1n(R(3, "\'+M+\'", "\'+o+\'"))\');3.t[e]=17}b.16(O,d)}},18:8(a,b,c){4 d=g+c;n(a.K[d]){a.K[d]=q}n(!a.x)a.x=[];n(!a.x[c]){a.x[c]=17;4 e=19 P(a,b,c);3.p.1o(e)}u b},y:8(){I{4 l=3.p.v;w(4 i=0;i<l;i++){3.p[i].y()}3.p=[];3.t={}}J(e){}}};r.Q(\'1p\',8(){h.y()});4 k={1q:{9:\'1r\',m:\'1s\'},1t:{9:\'1u\',m:\'1v\'},1a:{9:\'1a\',m:\'1w\'}};8 P(a,b,c){3.A=a;3.B=b;4 d=19 1x(\'(^|\\\\s)\'+c+\'(\\\\s|$)\',\'g\');3.9=8(){a.o+=\' \'+c};3.m=8(){a.o=a.o.N(d,\' \')};a.Q(k[b].9,3.9);a.Q(k[b].m,3.m)}P.1y={y:8(){3.A.1b(k[3.B].9,3.9);3.A.1b(k[3.B].m,3.m);3.9=q;3.m=q;3.A=q;3.B=q}};u 8(a,b,c){n(a){u h.18(a,b,c)}1z{h.11()}}})();',62,98,'|||this|var||||function|activator|||||||||||||deactivator|if|className|elements|null|window||callbacks|return|length|for|csshover|unload||node|type|hover|active|focus|test|parseStylesheet|imports|try|catch|style|affected|pseudo|replace|newSelect|CSSHoverElement|attachEvent|CSSHover|REG_AFFECTED|REG_PSEUDO|REG_SELECT|z0|9_|REG_CLASS|on|REG_MSIE|REG_COMPAT|init|document|securityException|parseCSSRule|exec|addRule|true|patch|new|onfocus|detachEvent|gi|msie|backcompat|csh|navigator|userAgent|compatMode|styleSheets|rules|selectorText|cssText|expression|push|onbeforeunload|onhover|onmouseenter|onmouseleave|onactive|onmousedown|onmouseup|onblur|RegExp|prototype|else'.split('|'),0,{}));
-
+<public:attach event="ondocumentready" onevent="CSSHover()" />
+<script>
+/**
+ *	Whatever:hover - V3.00.081222
+ *	--------------------------------------------------------
+ *	Author  - Peter Nederlof, http://www.xs4all.nl/~peterned
+ *	License - http://creativecommons.org/licenses/LGPL/2.1
+ *	Packed  - http://dean.edwards.name/packer
+ *
+ *	howto: body { behavior:url("csshover3.htc"); }
+ */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('r.R=(8(){4 f=/(^|\\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(C|D|E))/i,S=/(.*?)\\:(C|D|E)/i,T=/[^:]+:([a-z-]+).*/i,U=/(\\.([a-V-W-]+):[a-z]+)|(:[a-z]+)/1c,X=/\\.([a-V-W-]*Y(C|D|E))/i,Z=/1d (5|6|7)/i,10=/1e/i;4 g=\'1f-\';4 h={p:[],t:{},11:8(){n(!Z.F(1g.1h)&&!10.F(r.12.1i))u;4 a=r.12.1j,l=a.v;w(4 i=0;i<l;i++){3.G(a[i])}},G:8(a){n(a.H){I{4 b=a.H,l=b.v;w(4 i=0;i<l;i++){3.G(a.H[i])}}J(13){}}I{4 c=a.1k,l=c.v;w(4 j=0;j<l;j++){3.14(c[j],a)}}J(13){}},14:8(a,b){4 c=a.1l;n(f.F(c)){4 d=a.K.1m,L=S.15(c)[1],M=c.N(T,\'Y$1\'),O=c.N(U,\'.$2\'+M),o=X.15(O)[1];4 e=L+o;n(!3.t[e]){b.16(L,g+o+\':1n(R(3, "\'+M+\'", "\'+o+\'"))\');3.t[e]=17}b.16(O,d)}},18:8(a,b,c){4 d=g+c;n(a.K[d]){a.K[d]=q}n(!a.x)a.x=[];n(!a.x[c]){a.x[c]=17;4 e=19 P(a,b,c);3.p.1o(e)}u b},y:8(){I{4 l=3.p.v;w(4 i=0;i<l;i++){3.p[i].y()}3.p=[];3.t={}}J(e){}}};r.Q(\'1p\',8(){h.y()});4 k={1q:{9:\'1r\',m:\'1s\'},1t:{9:\'1u\',m:\'1v\'},1a:{9:\'1a\',m:\'1w\'}};8 P(a,b,c){3.A=a;3.B=b;4 d=19 1x(\'(^|\\\\s)\'+c+\'(\\\\s|$)\',\'g\');3.9=8(){a.o+=\' \'+c};3.m=8(){a.o=a.o.N(d,\' \')};a.Q(k[b].9,3.9);a.Q(k[b].m,3.m)}P.1y={y:8(){3.A.1b(k[3.B].9,3.9);3.A.1b(k[3.B].m,3.m);3.9=q;3.m=q;3.A=q;3.B=q}};u 8(a,b,c){n(a){u h.18(a,b,c)}1z{h.11()}}})();',62,98,'|||this|var||||function|activator|||||||||||||deactivator|if|className|elements|null|window||callbacks|return|length|for|csshover|unload||node|type|hover|active|focus|test|parseStylesheet|imports|try|catch|style|affected|pseudo|replace|newSelect|CSSHoverElement|attachEvent|CSSHover|REG_AFFECTED|REG_PSEUDO|REG_SELECT|z0|9_|REG_CLASS|on|REG_MSIE|REG_COMPAT|init|document|securityException|parseCSSRule|exec|addRule|true|patch|new|onfocus|detachEvent|gi|msie|backcompat|csh|navigator|userAgent|compatMode|styleSheets|rules|selectorText|cssText|expression|push|onbeforeunload|onhover|onmouseenter|onmouseleave|onactive|onmousedown|onmouseup|onblur|RegExp|prototype|else'.split('|'),0,{}));
+
 </script>

app/Resources/public/css/default_scorm.css

@@ -1,164 +1,164 @@
-/*
-File used to display Learning Path item in student view
-If scorm.css file exists in theme folder, scorm.css file is used instead of this one
-See https://support.chamilo.org/issues/6976
-*/
-
-.inner_lp_toc {
-    overflow: auto;
-    background-color: white;
-    height: 210px;
-}
-
-.inner_lp_toc .scorm_item a {
-    font-weight: bold;
-    font-size: 14px;
-    margin-right: 1px;
-    padding-bottom: 2px;
-    text-decoration: none;
-    color: #2F3E46;
-}
-
-.inner_lp_toc .scorm_item a.chapter_module {
-    font-weight: normal;
-    margin-right: 10px;
-}
-.inner_lp_toc .scorm_item_highlight {
-    border: 1px solid #999;
-    background:#999;
-    font-weight:bold;
-    text-shadow:0 -1px 1px #666;
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#999));
-    background-image:-webkit-linear-gradient(top,#666,#999);
-    background-image:-moz-linear-gradient(top,#666,#999);
-    background-image:-ms-linear-gradient(top,#666,#999);
-    background-image:-o-linear-gradient(top,#666,#999);
-    background-image:linear-gradient(top,#666,#999);
-    margin-right: 0px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-}
-
-.inner_lp_toc .scorm_item_highlight a {
-    color:#fff;
-    margin-right: 1px;
-    text-decoration: none;
-    font-weight: bold;
-}
-
-.inner_lp_toc .scorm_item_section {
-    border:1px solid #222;
-    background:#333;
-    font-weight:bold;
-    color:#fff;
-    text-shadow:0 -1px 1px #000;
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));
-    background-image:-webkit-linear-gradient(top,#555,#333);
-    background-image:-moz-linear-gradient(top,#555,#333);
-    background-image:-ms-linear-gradient(top,#555,#333);
-    background-image:-o-linear-gradient(top,#555,#333);
-    background-image:linear-gradient(top,#555,#333);
-    margin-right: 1px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-}
-
-.inner_lp_toc .scorm_item {
-    font-size: 16px;
-    margin-left: 10px;
-    margin-right:10px;
-    text-decoration: none;
-    border-color: rgba(255, 255, 255, 0.3);
-}
-
-.inner_lp_toc .scorm_item_1 {
-    border-bottom: 1px solid #CCCCCC;
-    background:#eee;
-    font-weight:bold;
-    color:#444;
-    text-shadow:0 1px 1px #f6f6f6;
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
-    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
-    background-image:linear-gradient(top,#fdfdfd,#eee);
-    margin-right: 1px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-    font-weight: normal;
-     background:#FDFDFD;
-}
-
-.inner_lp_toc .scorm_item_2 {
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
-    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
-    background-image:linear-gradient(top,#fdfdfd,#eee);
-    border-bottom: 1px solid #CCCCCC;
-    color: #444444;
-    font-weight: bold;
-    text-shadow: 0 1px 1px #F6F6F6;
-    margin-right: 1px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-    font-weight: normal;
-}
-
-.inner_lp_toc .scorm_item_section .scorm_item:before {
-    content : url('../../img/lp_section.png');  /* path from main/newscorm/lp_controller.php file */
-    vertical-align: text-top;
-    margin-right : 5px;
-}
-
-/* learning path's classes for section and item for 5 levels of depth */
-
-.scorm_section_level_0 {
-    padding : 0 0 0 0;
-}
-
-.scorm_section_level_1 {
-    padding : 0 0.5em 0 2em;
-}
-
-.scorm_section_level_2 {
-    padding : 0 0.5em 0 4em;
-}
-
-.scorm_section_level_3 {
-    padding : 0 0.5em 0 6em;
-}
-
-.scorm_section_level_4 {
-    padding : 0 0.5em 0 8em;
-}
-
-.scorm_section_level_5 {
-    padding : 0 0.5em 0 10em;
-}
-
-.scorm_item_level_0 {
-    padding : 0 0 0 0;
-}
-
-.scorm_item_level_1 {
-    padding : 0 0.5em 0 1.5em;
-}
-
-.scorm_item_level_2 {
-    padding : 0 0.5em 0 3em;
-}
-
-.scorm_item_level_3 {
-    padding : 0 0.5em 0 4.5em;
-}
-
-.scorm_item_level_4 {
-    padding : 0 0.5em 0 6em;
-}
-
-.scorm_item_level_5 {
-    padding : 0 0.5em 0 7.5em;
-}
+/*
+File used to display Learning Path item in student view
+If scorm.css file exists in theme folder, scorm.css file is used instead of this one
+See https://support.chamilo.org/issues/6976
+*/
+
+.inner_lp_toc {
+    overflow: auto;
+    background-color: white;
+    height: 210px;
+}
+
+.inner_lp_toc .scorm_item a {
+    font-weight: bold;
+    font-size: 14px;
+    margin-right: 1px;
+    padding-bottom: 2px;
+    text-decoration: none;
+    color: #2F3E46;
+}
+
+.inner_lp_toc .scorm_item a.chapter_module {
+    font-weight: normal;
+    margin-right: 10px;
+}
+.inner_lp_toc .scorm_item_highlight {
+    border: 1px solid #999;
+    background:#999;
+    font-weight:bold;
+    text-shadow:0 -1px 1px #666;
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#999));
+    background-image:-webkit-linear-gradient(top,#666,#999);
+    background-image:-moz-linear-gradient(top,#666,#999);
+    background-image:-ms-linear-gradient(top,#666,#999);
+    background-image:-o-linear-gradient(top,#666,#999);
+    background-image:linear-gradient(top,#666,#999);
+    margin-right: 0px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+}
+
+.inner_lp_toc .scorm_item_highlight a {
+    color:#fff;
+    margin-right: 1px;
+    text-decoration: none;
+    font-weight: bold;
+}
+
+.inner_lp_toc .scorm_item_section {
+    border:1px solid #222;
+    background:#333;
+    font-weight:bold;
+    color:#fff;
+    text-shadow:0 -1px 1px #000;
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));
+    background-image:-webkit-linear-gradient(top,#555,#333);
+    background-image:-moz-linear-gradient(top,#555,#333);
+    background-image:-ms-linear-gradient(top,#555,#333);
+    background-image:-o-linear-gradient(top,#555,#333);
+    background-image:linear-gradient(top,#555,#333);
+    margin-right: 1px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+}
+
+.inner_lp_toc .scorm_item {
+    font-size: 16px;
+    margin-left: 10px;
+    margin-right:10px;
+    text-decoration: none;
+    border-color: rgba(255, 255, 255, 0.3);
+}
+
+.inner_lp_toc .scorm_item_1 {
+    border-bottom: 1px solid #CCCCCC;
+    background:#eee;
+    font-weight:bold;
+    color:#444;
+    text-shadow:0 1px 1px #f6f6f6;
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
+    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
+    background-image:linear-gradient(top,#fdfdfd,#eee);
+    margin-right: 1px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+    font-weight: normal;
+     background:#FDFDFD;
+}
+
+.inner_lp_toc .scorm_item_2 {
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
+    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
+    background-image:linear-gradient(top,#fdfdfd,#eee);
+    border-bottom: 1px solid #CCCCCC;
+    color: #444444;
+    font-weight: bold;
+    text-shadow: 0 1px 1px #F6F6F6;
+    margin-right: 1px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+    font-weight: normal;
+}
+
+.inner_lp_toc .scorm_item_section .scorm_item:before {
+    content : url('../../img/lp_section.png');  /* path from main/newscorm/lp_controller.php file */
+    vertical-align: text-top;
+    margin-right : 5px;
+}
+
+/* learning path's classes for section and item for 5 levels of depth */
+
+.scorm_section_level_0 {
+    padding : 0 0 0 0;
+}
+
+.scorm_section_level_1 {
+    padding : 0 0.5em 0 2em;
+}
+
+.scorm_section_level_2 {
+    padding : 0 0.5em 0 4em;
+}
+
+.scorm_section_level_3 {
+    padding : 0 0.5em 0 6em;
+}
+
+.scorm_section_level_4 {
+    padding : 0 0.5em 0 8em;
+}
+
+.scorm_section_level_5 {
+    padding : 0 0.5em 0 10em;
+}
+
+.scorm_item_level_0 {
+    padding : 0 0 0 0;
+}
+
+.scorm_item_level_1 {
+    padding : 0 0.5em 0 1.5em;
+}
+
+.scorm_item_level_2 {
+    padding : 0 0.5em 0 3em;
+}
+
+.scorm_item_level_3 {
+    padding : 0 0.5em 0 4.5em;
+}
+
+.scorm_item_level_4 {
+    padding : 0 0.5em 0 6em;
+}
+
+.scorm_item_level_5 {
+    padding : 0 0.5em 0 7.5em;
+}

app/Resources/public/css/themes/chamilo/scormfs.css

@@ -1,82 +1,82 @@
-.scormpage {
-}
-.scormpage .menu {
-	width: 180px;
-	padding: 0px;
-	font-size: small;
-	position: absolute;
-	background-color: white;
-}
-.scormpage .menu .lp_nav {
-	height: 50px;
-	width: 160px;
-	padding-top: 4px;
-	padding-bottom:0px;
-	/*	
-	margin-left: 10px;
-	margin-right: 10px;
-*/
-	margin-top: 0px;
-}
-.lp_navigation_elem {
-	padding-left: 15px;
-	padding-top: 0px;
-}
-/*.scormpage .menu */
-.lp_navigation_elem .progresstext {
-	font-size: smaller;
-}
-/*.scormpage .menu */
-.lp_navigation_elem .buttons {
-	margin-left: 5px;
-	margin-right: 0em;
-	margin-top: 0.4em;
-}
-#msg_div_id {
-	padding-left: 10px;
-	padding-top: 4px;
-}
-.scormpage .menu .notification {
-	height: 50px;
-	margin-left: 15px;
-	margin-right: 15px;
-}
-.scormpage .menu .notification .message {
-	height: 50px;
-	width: 140px;
-	border: none;
-}
-.scormpage .menu .notification .lp_log {
-	height: 100px;
-	width: 180px;
-	border: none;
-	overflow: auto;
-}
-.scormpage .content .iframe {
-	/*
-	border: none;
-	height: 700px;
-	margin: 0px;
-	padding-right: 0px;
-	margin-right: 0%;
-	margin-left: 0%;
-	*/
-	/* trying the absolute mode */
-	position: fixed;
-	bottom:0;
-	left:0;
-	width: 100%;
-	height: 100%;
-}
-.scormpage .footer {
-	clear: both;
-}
-#image_preview {
-	padding-left: 17px;
-}
-#author_name {
-	padding-left: 5px;
-	padding-top: 5px;
-	font-size: 11px;
-	color:#888;
-}
+.scormpage {
+}
+.scormpage .menu {
+	width: 180px;
+	padding: 0px;
+	font-size: small;
+	position: absolute;
+	background-color: white;
+}
+.scormpage .menu .lp_nav {
+	height: 50px;
+	width: 160px;
+	padding-top: 4px;
+	padding-bottom:0px;
+	/*	
+	margin-left: 10px;
+	margin-right: 10px;
+*/
+	margin-top: 0px;
+}
+.lp_navigation_elem {
+	padding-left: 15px;
+	padding-top: 0px;
+}
+/*.scormpage .menu */
+.lp_navigation_elem .progresstext {
+	font-size: smaller;
+}
+/*.scormpage .menu */
+.lp_navigation_elem .buttons {
+	margin-left: 5px;
+	margin-right: 0em;
+	margin-top: 0.4em;
+}
+#msg_div_id {
+	padding-left: 10px;
+	padding-top: 4px;
+}
+.scormpage .menu .notification {
+	height: 50px;
+	margin-left: 15px;
+	margin-right: 15px;
+}
+.scormpage .menu .notification .message {
+	height: 50px;
+	width: 140px;
+	border: none;
+}
+.scormpage .menu .notification .lp_log {
+	height: 100px;
+	width: 180px;
+	border: none;
+	overflow: auto;
+}
+.scormpage .content .iframe {
+	/*
+	border: none;
+	height: 700px;
+	margin: 0px;
+	padding-right: 0px;
+	margin-right: 0%;
+	margin-left: 0%;
+	*/
+	/* trying the absolute mode */
+	position: fixed;
+	bottom:0;
+	left:0;
+	width: 100%;
+	height: 100%;
+}
+.scormpage .footer {
+	clear: both;
+}
+#image_preview {
+	padding-left: 17px;
+}
+#author_name {
+	padding-left: 5px;
+	padding-top: 5px;
+	font-size: 11px;
+	color:#888;
+}

composer.json

@@ -9,8 +9,8 @@
         "irc": "irc://irc.freenode.org/chamilo"
     },
     "autoload": {
-        "psr-0": {
-            "Chamilo": "src/"
+        "psr-4": {
+            "Chamilo\\": "src/Chamilo/"
         },
         "classmap": [
             "main/auth",
@@ -51,6 +51,7 @@
         "doctrine/migrations": "1.0.*@dev",
         "symfony/doctrine-bridge": "2.6.4",
         "symfony/validator": "2.6.4",
+        "symfony/filesystem": "~2.6",
         "gedmo/doctrine-extensions": "~2.3",
         "sonata-project/user-bundle": "~2.2",
 	    "ramsey/array_column": "~1.1",
@@ -78,7 +79,15 @@
         "behat/mink-extension": "*",
         "behat/mink-goutte-driver": "*",
         "behat/mink-selenium2-driver": "*"
+    },
+    "scripts": {
+        "post-update-cmd": [
 
+            "Chamilo\\CoreBundle\\Component\\Theme\\DumpTheme::dumpCssFiles"
+        ],
+        "post-install-cmd": [
+            "Chamilo\\CoreBundle\\Component\\Theme\\DumpTheme::dumpCssFiles"
+        ]
     },
     "extra": {
         "branch-alias": {

main/admin/settings.lib.php

@@ -11,6 +11,10 @@
  * @package chamilo.admin
  */
 
+define('CSS_UPLOAD_PATH', api_get_path(SYS_APP_PATH).'Resources/public/css/themes/');
+
+use Symfony\Component\Filesystem\Filesystem;
+
 /**
  * This function allows easy activating and inactivating of regions
  * @author Julio Montoya <gugli100@gmail.com> Beeznest 2012
@@ -36,12 +40,6 @@ function handle_regions()
     $possible_plugins  = $plugin_obj->read_plugins_from_path();
     $installed_plugins = $plugin_obj->get_installed_plugins();
 
-    /*if (!empty($installed_plugins)) {
-        $not_installed = array_diff($possible_plugins, $installed_plugins);
-    } else {
-        $not_installed = $possible_plugins;
-    }*/
-
     echo '<form name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'">';
     echo '<table class="data_table">';
     echo '<tr>';
@@ -189,7 +187,8 @@ function handle_plugins()
     echo '</table>';
 
     echo '<div class="form-actions bottom_actions">';
-    echo '<button class="btn btn-success" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button>';
+    echo '<button class="btn btn-success" type="submit" name="submit_plugins">'.
+            get_lang('EnablePlugins').'</button>';
     echo '</div>';
     echo '</form>';
 }
@@ -234,8 +233,8 @@ function handle_stylesheets()
 
     $show_upload_form = false;
 
-    if (!is_writable(api_get_path(SYS_CODE_PATH).'css/')) {
-        Display::display_error_message(api_get_path(SYS_CODE_PATH).'css/'.get_lang('IsNotWritable'));
+    if (!is_writable(CSS_UPLOAD_PATH)) {
+        Display::display_error_message(CSS_UPLOAD_PATH.get_lang('IsNotWritable'));
     } else {
         // Uploading a new stylesheet.
         if ($_configuration['access_url'] == 1) {
@@ -281,23 +280,26 @@ function handle_stylesheets()
         array('id' => 'stylesheets_id')
     );
 
-    $list_of_styles = array();
     $list_of_names  = array();
     $selected = '';
     $dirpath = '';
     $safe_style_dir = '';
 
-    if ($handle = @opendir(api_get_path(SYS_PATH).'main/css/')) {
+    if ($handle = @opendir(CSS_UPLOAD_PATH)) {
         $counter = 1;
         while (false !== ($style_dir = readdir($handle))) {
-            if (substr($style_dir, 0, 1) == '.') { // Skip directories starting with a '.'
+            if (substr($style_dir, 0, 1) == '.') {
+                // Skip directories starting with a '.'
                 continue;
             }
-            $dirpath = api_get_path(SYS_PATH).'main/css/'.$style_dir;
+            $dirpath = CSS_UPLOAD_PATH.$style_dir;
 
             if (is_dir($dirpath)) {
                 if ($style_dir != '.' && $style_dir != '..') {
-                    if (isset($_POST['style']) && (isset($_POST['preview']) or isset($_POST['download'])) && $_POST['style'] == $style_dir) {
+                    if (isset($_POST['style']) &&
+                        (isset($_POST['preview']) || isset($_POST['download'])) &&
+                        $_POST['style'] == $style_dir
+                    ) {
                         $safe_style_dir = $style_dir;
                     } else {
                         if ($currentstyle == $style_dir || ($style_dir == 'chamilo' && !$currentstyle)) {
@@ -311,12 +313,7 @@ function handle_stylesheets()
                     $show_name = ucwords(str_replace('_', ' ', $style_dir));
 
                     if ($is_style_changeable) {
-                        $list_of_styles[$style_dir] = "<option value=\"".$style_dir."\" ".$selected." /> $show_name </option>";
                         $list_of_names[$style_dir]  = $show_name;
-                        //echo "<input type=\"radio\" name=\"style\" value=\"".$style_dir."\" ".$selected." onClick=\"parent.preview.location='style_preview.php?style=".$style_dir."';\"/>";
-                        //echo '<a href="style_preview.php?style='.$style_dir.'" target="preview">'.$show_name.'</a>';
-                    } else {
-                        //echo '<a href="style_preview.php?style='.$style_dir.'" target="preview">'.$show_name.'</a>';
                     }
                     $counter++;
                 }
@@ -328,8 +325,8 @@ function handle_stylesheets()
     // Sort styles in alphabetical order.
     asort($list_of_names);
     $select_list = array();
-    foreach ($list_of_names as $style_dir=>$item) {
-        $select_list[$style_dir] = strip_tags($list_of_styles[$style_dir]);
+    foreach ($list_of_names as $style_dir => $item) {
+        $select_list[$style_dir] = $item;
     }
 
     $styles = &$form_change->addElement('select', 'style', get_lang('NameStylesheet'), $select_list);
@@ -356,14 +353,6 @@ function handle_stylesheets()
     }
 
     if ($is_style_changeable) {
-
-        /*$group = [
-            $form_change->createElement('button', 'save', get_lang('SaveSettings')),
-            $form_change->createElement('button', 'preview', get_lang('Preview')),
-            $form_change->createElement('button', 'download', get_lang('Download'))
-        ];*/
-
-        //var_dump($group);
         $group = [
             $form_change->addButtonSave(get_lang('SaveSettings'), 'save', true),
             $form_change->addButtonPreview(get_lang('Preview'), 'preview', true),
@@ -402,7 +391,7 @@ function upload_stylesheet($values, $picture)
     $result = false;
     // Valid name for the stylesheet folder.
     $style_name = api_preg_replace('/[^A-Za-z0-9]/', '', $values['name_stylesheet']);
-    $cssToUpload = api_get_path(SYS_APP_PATH).'Resources/public/css/';
+    $cssToUpload = CSS_UPLOAD_PATH;
 
     // Create the folder if needed.
     if (!is_dir($cssToUpload.$style_name.'/')) {
@@ -410,6 +399,7 @@ function upload_stylesheet($values, $picture)
     }
 
     $info = pathinfo($picture['name']);
+
     if ($info['extension'] == 'zip') {
         // Try to open the file and extract it in the theme.
         $zip = new ZipArchive();
@@ -452,7 +442,10 @@ function upload_stylesheet($values, $picture)
                     $error_string .= '<li>'.$invalid_file.'</li>';
                 }
                 $error_string .= '</ul>';
-                Display::display_error_message(get_lang('ErrorStylesheetFilesExtensionsInsideZip').$error_string, false);
+                Display::display_error_message(
+                    get_lang('ErrorStylesheetFilesExtensionsInsideZip').$error_string,
+                    false
+                );
             } else {
                 // If the zip does not contain a single directory, extract it.
                 if (!$single_directory) {
@@ -498,6 +491,12 @@ function upload_stylesheet($values, $picture)
         move_uploaded_file($picture['tmp_name'], $cssToUpload.$style_name.'/'.$picture['name']);
         $result = true;
     }
+
+    if ($result) {
+        $fs = new Filesystem();
+        $fs->mirror($cssToUpload, api_get_path(SYS_PATH).'web/css/');
+    }
+
     return $result;
 }
 
@@ -596,7 +595,7 @@ function store_stylesheets()
  */
 function is_style($style)
 {
-    $dir = api_get_path(SYS_PATH).'main/css/';
+    $dir = CSS_UPLOAD_PATH;
     $dirs = scandir($dir);
     $style = str_replace(array('/', '\\'), array('', ''), $style); // Avoid slashes or backslashes.
     if (in_array($style, $dirs) && is_dir($dir.$style)) {
@@ -705,9 +704,9 @@ function handle_search()
         }
         */
 
-        $xapian_loaded          = Display::return_icon('bullet_green.gif', get_lang('Ok'));
-        $dir_exists             = Display::return_icon('bullet_green.gif', get_lang('Ok'));
-        $dir_is_writable        = Display::return_icon('bullet_green.gif', get_lang('Ok'));
+        $xapian_loaded = Display::return_icon('bullet_green.gif', get_lang('Ok'));
+        $dir_exists = Display::return_icon('bullet_green.gif', get_lang('Ok'));
+        $dir_is_writable = Display::return_icon('bullet_green.gif', get_lang('Ok'));
         $specific_fields_exists = Display::return_icon('bullet_green.gif', get_lang('Ok'));
 
         //Testing specific fields
@@ -758,7 +757,9 @@ function handle_search()
             $table->set_header(2, get_lang('Status'), false);
             echo  $table->display();
         } else {
-            Display::display_warning_message(get_lang('YouAreUsingChamiloInAWindowsPlatformSadlyYouCantConvertDocumentsInOrderToSearchTheContentUsingThisTool'));
+            Display::display_warning_message(
+                get_lang('YouAreUsingChamiloInAWindowsPlatformSadlyYouCantConvertDocumentsInOrderToSearchTheContentUsingThisTool')
+            );
         }
     }
 }
@@ -778,7 +779,8 @@ function handle_templates() {
 
     if ($action != 'add') {
         echo '<div class="actions" style="margin-left: 1px;">';
-        echo '<a href="settings.php?category=Templates&amp;action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="settings.php?category=Templates&amp;action=add">'.
+                Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }
 
@@ -821,7 +823,8 @@ function handle_templates() {
  * @version August 2008
  * @since Dokeos 1.8.6
  */
-function display_templates() {
+function display_templates()
+{
     $table = new SortableTable('templates', 'get_number_of_templates', 'get_template_data', 1);
     $table->set_additional_parameters(array('category' => Security::remove_XSS($_GET['category'])));
     $table->set_header(0, get_lang('Image'), true, array('style' => 'width: 101px;'));
@@ -920,7 +923,8 @@ function image_filter($image) {
 }
 
 /**
- * Add (or edit) a template. This function displays the form and also takes care of uploading the image and storing the information in the database
+ * Add (or edit) a template. This function displays the form and also takes
+ * care of uploading the image and storing the information in the database
  *
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  * @version August 2008
@@ -1047,13 +1051,10 @@ function add_edit_template() {
                 // Display a feedback message.
                 Display::display_confirmation_message(get_lang('TemplateEdited'));
             }
-
         }
         Security::clear_token();
         display_templates();
-
     } else {
-
         $token = Security::get_token();
         $form->addElement('hidden','sec_token');
         $form->setConstants(array('sec_token' => $token));
@@ -1291,17 +1292,23 @@ function generate_settings_form($settings, $settings_by_access_list) {
 
                     // Profile tab option should be hidden when the social tool is enabled.
                     if (api_get_setting('allow_social_tool') == 'true') {
-                        if ($rowkeys['variable'] == 'show_tabs' && $rowkeys['subkey'] == 'my_profile') { continue; }
+                        if ($rowkeys['variable'] == 'show_tabs' && $rowkeys['subkey'] == 'my_profile') {
+                            continue;
+                        }
                     }
 
                     // Hiding the gradebook option.
-                    if ($rowkeys['variable'] == 'show_tabs' && $rowkeys['subkey'] == 'my_gradebook') { continue; }
+                    if ($rowkeys['variable'] == 'show_tabs' && $rowkeys['subkey'] == 'my_gradebook') {
+                        continue;
+                    }
 
                     $element = & $form->createElement('checkbox', $rowkeys['subkey'], '', get_lang($rowkeys['subkeytext']));
                     if ($row['access_url_changeable'] == 1) {
                         // 2. We look into the DB if there is a setting for a specific access_url.
                         $access_url = $_configuration['access_url'];
-                        if (empty($access_url )) $access_url = 1;
+                        if (empty($access_url)) {
+                            $access_url = 1;
+                        }
                         $sql = "SELECT selected_value FROM $table_settings_current WHERE variable='".$rowkeys['variable']."' AND subkey='".$rowkeys['subkey']."'  AND  subkeytext='".$rowkeys['subkeytext']."' AND access_url =  $access_url";
                         $result_access = Database::query($sql);
                         $row_access = Database::fetch_array($result_access);
@@ -1378,7 +1385,8 @@ function search_setting($search)
         return array();
     }
     $table_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-    $sql = "SELECT * FROM $table_settings_current WHERE category <> 'Plugins' GROUP BY variable ORDER BY id ASC ";
+    $sql = "SELECT * FROM $table_settings_current
+            WHERE category <> 'Plugins' GROUP BY variable ORDER BY id ASC ";
     $result = Database::store_result(Database::query($sql), 'ASSOC');
     $settings = array();
 

main/exercice/export/scorm/scorm_export.php

@@ -35,7 +35,7 @@ class ScormAssessmentItem
      {
         $this->question = $question;
         //$this->answer = new Answer($question->id);
-        $this->question->setAnswer();        
+        $this->question->setAnswer();
         $this->questionIdent = "QST_" . $question->id ;
         $this->standalone = $standalone;
         //echo "<pre>".print_r($this,1)."</pre>";
@@ -67,7 +67,7 @@ class ScormAssessmentItem
      	if($this->standalone){return '</html>';}
      	return '';
      }
-     
+
 	/**
 	 * Start document header
 	 */
@@ -75,7 +75,7 @@ class ScormAssessmentItem
 		if($this->standalone){return '<head>'. "\n";}
 		return '';
 	}
-    
+
 	/**
 	 * Print CSS inclusion
 	 */
@@ -278,26 +278,24 @@ class ScormSection
      function end_page() {
        return '</html>';
      }
-     
+
 	/**
 	 * Start document header
 	 */
 	function start_header() {
 		return '<head>'. "\n";
 	}
-    
+
 	/**
 	 * Print CSS inclusion
 	 */
 	function css() {
 		$css = '<style type="text/css" media="screen, projection">'."\n";
 		$css .= '/*<![CDATA[*/'."\n";
-		//$css .= '@import "'.api_get_path(WEB_PATH).'main/css/public_admin/default.css";'."\n";		
 		$css .= '/*]]>*/'."\n";
 		$css .= '</style>'."\n";
 		$css .= '<style type="text/css" media="print">'."\n";
 		$css .= '/*<![CDATA[*/'."\n";
-		//$css .= '@import "'.api_get_path(WEB_PATH).'main/css/public_admin/print.css";'."\n";
 		$css .= '/*]]>*/'."\n";
 		$css .= '</style>'."\n";
 		return $css;
@@ -309,7 +307,7 @@ class ScormSection
 	function end_header() {
 		return '</head>'. "\n";
 	}
-    
+
     /**
      * Start the itemBody
      *
@@ -317,7 +315,7 @@ class ScormSection
     function start_js() {
        return '<script type="text/javascript" language="javascript">'. "\n";
     }
-    
+
 	/**
 	 * Common JS functions
 	 */
@@ -492,7 +490,7 @@ class ScormSection
     function end_js() {
        return '</script>'. "\n";
     }
-    
+
     /**
      * Start the itemBody
      *
@@ -611,4 +609,4 @@ function export_question($questionId, $standalone = true, $js_id) {
     $assessmentItem = new ScormAssessmentItem($question, $standalone);
     //echo "<pre>".print_r($scorm,1)."</pre>";exit;
     return $assessmentItem->export();
-}
+}

main/inc/lib/api.lib.php

@@ -591,7 +591,7 @@ require_once __DIR__.'/internationalization.lib.php';
  * api_get_path(SYS_PLUGIN_PATH)                /var/www/chamilo/plugin/
  * api_get_path(SYS_TEST_PATH)                  /var/www/chamilo/tests/
  * api_get_path(SYS_TEMPLATE_PATH)              /var/www/chamilo/main/template/
- * api_get_path(SYS_CSS_PATH)                   /var/www/chamilo/main/css/
+ * api_get_path(SYS_CSS_PATH)                   /var/www/chamilo/app/Resources/public/css
  *
  * api_get_path(WEB_SERVER_ROOT_PATH)           http://www.mychamilo.org/
  * api_get_path(WEB_PATH)                       http://www.mychamilo.org/chamilo/
@@ -600,7 +600,7 @@ require_once __DIR__.'/internationalization.lib.php';
  * api_get_path(WEB_PLUGIN_PATH)                http://www.mychamilo.org/chamilo/plugin/
  * api_get_path(WEB_ARCHIVE_PATH)               http://www.mychamilo.org/chamilo/app/cache/
  * api_get_path(WEB_IMG_PATH)                   http://www.mychamilo.org/chamilo/main/img/
- * api_get_path(WEB_CSS_PATH)                   http://www.mychamilo.org/chamilo/main/css/
+ * api_get_path(WEB_CSS_PATH)                   http://www.mychamilo.org/chamilo/web/css/
  * api_get_path(WEB_LIBRARY_PATH)               http://www.mychamilo.org/chamilo/main/inc/lib/
  * api_get_path(WEB_LIBRARY_JS_PATH)            http://www.mychamilo.org/chamilo/web/Chamilo/javascript
  * api_get_path(WEB_TEMPLATE_PATH)              http://www.mychamilo.org/chamilo/main/template/
@@ -639,8 +639,8 @@ function api_get_path($path_type, $path = null)
         SYS_CODE_PATH           => '',
         SYS_LANG_PATH           => 'lang/',
         WEB_IMG_PATH            => 'img/',
-        WEB_CSS_PATH            => 'css/',
-        SYS_CSS_PATH            => 'css/',
+        WEB_CSS_PATH            => 'web/css/',
+        SYS_CSS_PATH            => 'app/Resources/public/css/',
         SYS_PLUGIN_PATH         => 'plugin/',
         WEB_PLUGIN_PATH         => 'plugin/',
         SYS_ARCHIVE_PATH        => 'app/cache/',
@@ -772,10 +772,10 @@ function api_get_path($path_type, $path = null)
         $paths[SYS_ARCHIVE_PATH]        = $paths[SYS_PATH].$paths[SYS_ARCHIVE_PATH];
         $paths[SYS_TEST_PATH]           = $paths[SYS_PATH].$paths[SYS_TEST_PATH];
         $paths[SYS_TEMPLATE_PATH]       = $paths[SYS_CODE_PATH].$paths[SYS_TEMPLATE_PATH];
-        $paths[SYS_CSS_PATH]            = $paths[SYS_CODE_PATH].$paths[SYS_CSS_PATH];
+        $paths[SYS_CSS_PATH]            = $paths[SYS_PATH].$paths[SYS_CSS_PATH];
         $paths[SYS_FONTS_PATH]          = $paths[SYS_CODE_PATH].$paths[SYS_FONTS_PATH];
 
-        $paths[WEB_CSS_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_CSS_PATH];
+        $paths[WEB_CSS_PATH]            = $paths[WEB_PATH].$paths[WEB_CSS_PATH];
         $paths[WEB_IMG_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_IMG_PATH];
         $paths[WEB_LIBRARY_PATH]        = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_PATH];
         $paths[WEB_LIBRARY_JS_PATH]     = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_JS_PATH];

src/Chamilo/CoreBundle/Component/Theme/DumpTheme.php

@@ -0,0 +1,23 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Component\Theme;
+
+use Symfony\Component\Filesystem\Filesystem;
+
+/**
+ * Class DumpTheme
+ */
+class DumpTheme
+{
+    /**
+     * Dump files
+     */
+    public static function dumpCssFiles()
+    {
+        $fs = new Filesystem();
+        $appCss = __DIR__.'/../../../../../app/Resources/public/css';
+        $newPath = __DIR__.'/../../../../../web/css';
+        $fs->mirror($appCss, $newPath);
+    }
+}