Browse Source

Merge pull request #1368 from aragonc/1.11.x

fix css chamilo
Alex Aragon Calixto 8 years ago
parent
commit
041c8f6f7d

+ 7 - 32
app/Resources/public/css/base.css

@@ -487,23 +487,9 @@ header{
     border: 1px solid #dcdcdc;
     border-radius: 5px;
     background: #ffffff; /* Old browsers */
-    background: -moz-linear-gradient(top, #ffffff 0%, #f6f6f6 47%, #ededed 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* IE10+ */
-    background: linear-gradient(to bottom, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */
 }
 .actions img:hover{
     background: #ededed; /* Old browsers */
-    background: -moz-linear-gradient(top, #ededed 2%, #f6f6f6 49%, #ffffff 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(2%,#ededed), color-stop(49%,#f6f6f6), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* IE10+ */
-    background: linear-gradient(to bottom, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
 }
 .actions .btn-toolbar {
     margin : 0px;
@@ -514,23 +500,9 @@ header{
     padding-right: 5px;
     margin-right: 5px;
     background: #ffffff; /* Old browsers */
-    background: -moz-linear-gradient(top, #ffffff 0%, #f6f6f6 47%, #ededed 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* IE10+ */
-    background: linear-gradient(to bottom, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */
 }
 .actions .btn-toolbar:hover{
     background: #ededed; /* Old browsers */
-    background: -moz-linear-gradient(top, #ededed 2%, #f6f6f6 49%, #ffffff 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(2%,#ededed), color-stop(49%,#f6f6f6), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* IE10+ */
-    background: linear-gradient(to bottom, #ededed 2%,#f6f6f6 49%,#ffffff 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
 }
 .actions .btn-toolbar img{
     background: none;
@@ -5840,10 +5812,16 @@ ul#toolnavbox-two li a.btn{
     font-size: 120%;
     margin-bottom: 0;
 }
-
+.
 #upload_form .fa-plus-square-o, #upload_form .fa-minus-square-o {
     cursor:pointer;
 }
+#upload, .description-upload{
+    padding-top: 30px;
+}
+#form-work{
+    padding-top: 30px;
+}
 .item-backup{
     padding-top: 5px;
     padding-bottom: 5px;
@@ -5928,9 +5906,6 @@ ul#toolnavbox-two li a.btn{
     display: inline-block;
     width: 100%;
 }
-.muted{
-    padding: 10px;
-}
 .group-title{
     margin-bottom: 20px;
     padding-bottom: 5px;

+ 9 - 7
main/admin/filler.php

@@ -61,13 +61,15 @@ if (count($output)>0) {
     Display::display_normal_message($result,false);
 }
 ?>
-<div id="datafiller" class="actions">
-  <h4><?php echo Display::return_icon('bug.png',get_lang('DataFiller'),null,ICON_SIZE_MEDIUM).' '.get_lang('DataFiller')?></h4>
-  <div class="description"><?php echo get_lang('ThisSectionIsOnlyVisibleOnSourceInstalls');?></div>
-  <ul class="fillers">
-    <li><a href="filler.php?fill=users"><?php echo Display::return_icon('user.png',get_lang('FillUsers'),null,ICON_SIZE_SMALL).' '.get_lang('FillUsers');?></a></li>
-    <li><a href="filler.php?fill=courses"><?php echo Display::return_icon('new-course.png',get_lang('FillCourses'),null,ICON_SIZE_SMALL).' '.get_lang('FillCourses');?></a></li>
-  </ul>
+<div id="datafiller" class="panel panel-default">
+    <div class="panel-body">
+    <h4><?php echo Display::return_icon('bug.png',get_lang('DataFiller'),null,ICON_SIZE_MEDIUM).' '.get_lang('DataFiller')?></h4>
+    <div class="description"><?php echo get_lang('ThisSectionIsOnlyVisibleOnSourceInstalls');?></div>
+    <ul class="fillers">
+      <li><a href="filler.php?fill=users"><?php echo Display::return_icon('user.png',get_lang('FillUsers'),null,ICON_SIZE_SMALL).' '.get_lang('FillUsers');?></a></li>
+      <li><a href="filler.php?fill=courses"><?php echo Display::return_icon('new-course.png',get_lang('FillCourses'),null,ICON_SIZE_SMALL).' '.get_lang('FillCourses');?></a></li>
+    </ul>
+    </div>
 </div>
 <?php
 /* FOOTER */

BIN
main/img/icons/64/file_upload.png


+ 5 - 2
main/img/icons/svg/file_upload.svg

@@ -33,7 +33,7 @@
      inkscape:cx="107.85434"
      inkscape:cy="-12.45216"
      inkscape:window-x="41"
-     inkscape:window-y="21"
+     inkscape:window-y="333"
      inkscape:window-maximized="1"
      inkscape:current-layer="g4175" />
   <svg:metadata
@@ -131,7 +131,10 @@
      transform="translate(0,290.13333)">
     <svg:g
        id="g4188"
-       transform="matrix(0.48735366,0,0,0.48735366,2.1440667,-288.72099)">
+       transform="matrix(0.48735366,0,0,0.48735366,2.1440667,-288.72099)"
+       inkscape:export-filename="/var/www/chamilo11/main/img/icons/64/file_upload.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
       <svg:g
          id="back"
          style="font-size:12px;stroke:#000000">

+ 1 - 1
main/work/upload.php

@@ -76,7 +76,7 @@ $interbreadcrumb[] = array(
 $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('UploadADocument'));
 
 $form = new FormValidator(
-    'form',
+    'form-work',
     'POST',
     api_get_self()."?".api_get_cidreq()."&id=".$work_id,
     '',

+ 1 - 1
main/work/work_list.php

@@ -59,7 +59,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !api_is_in
     $url = api_get_path(WEB_CODE_PATH).'work/upload.php?'.api_get_cidreq().'&id='.$workId;
     $actionsRight = Display::url(
         Display::return_icon(
-            'upload_package.png',
+            'upload_file.png',
             get_lang('UploadMyAssignment'),
             null,
             ICON_SIZE_MEDIUM