Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:18:18 +0000 (11:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:18:18 +0000 (11:18 +0800)
Conflicts:
files/renderer.php
lib/outputrenderers.php

1  2 
files/renderer.php
lib/form/dndupload.js
lib/outputrenderers.php
theme/base/style/course.css
theme/base/style/filemanager.css

@@@ -220,9 -220,10 +220,10 @@@ class core_files_renderer extends plugi
          <div class="fm-content-wrapper">
              <div class="fp-content"></div>
              <div class="fm-empty-container">
 -                <span class="dndupload-message">'.$strdndenabledinbox.'<br/><span class="dndupload-arrow"></span></span>
 +                <div class="dndupload-message">'.$strdndenabledinbox.'<br/><div class="dndupload-arrow"></div></div>
              </div>
 -            <div class="dndupload-target">'.$strdroptoupload.'<br/><span class="dndupload-arrow"></span></div>
 +            <div class="dndupload-target">'.$strdroptoupload.'<br/><div class="dndupload-arrow"></div></div>
+             <div class="dndupload-progressbars"></div>
              <div class="dndupload-uploadinprogress">'.$icon_progress.'</div>
          </div>
          <div class="filemanager-updating">'.$icon_progress.'</div>
Simple merge
              $html .= <<<EOD
      <div id="file_info_{$client_id}" class="mdl-left filepicker-filelist" style="position: relative">
      <div class="filepicker-filename">
 -        <div class="filepicker-container">$currentfile<span class="dndupload-message">$strdndenabled <br/><span class="dndupload-arrow"></span></span></div>
 -    <div class="dndupload-progressbars"></div>
 +        <div class="filepicker-container">$currentfile<div class="dndupload-message">$strdndenabled <br/><div class="dndupload-arrow"></div></div></div>
++        <div class="dndupload-progressbars"></div>
      </div>
 -    <div><div class="dndupload-target">{$strdroptoupload}<br/><span class="dndupload-arrow"></span></div></div>
 +    <div><div class="dndupload-target">{$strdroptoupload}<br/><div class="dndupload-arrow"></div></div></div>
      </div>
  EOD;
          }
Simple merge
@@@ -347,8 -345,14 +347,14 @@@ a.ygtvspacer:hover {color: transparent;
  .dndsupported .dndupload-ready .dndupload-target {display:block;}
  .dndupload-uploadinprogress {display:none;text-align:center;}
  .dndupload-uploading .dndupload-uploadinprogress {display:block;}
 -.dndupload-arrow {background:url([[pix:theme|fp/dnd_arrow]]) center no-repeat;width:60px;height:80px;position:absolute;margin-left: -28px;top: 5px;}
 +.dndupload-arrow {background:url([[pix:theme|fp/dnd_arrow]]) center no-repeat;width:100%;height:80px;position:absolute;margin-left: -28px;top: 5px;}
  .fitem.disabled .filepicker-container, .fitem.disabled .fm-empty-container {display:none;}
+ .dndupload-progressbars {padding:10px;display:none;}
+ .dndupload-inprogress .dndupload-progressbars {display:block;}
+ .dndupload-inprogress .fp-content {display:none;}
+ .filemanager.fm-noitems .dndupload-inprogress .fm-empty-container {display:none;}
+ .filepicker-filelist.dndupload-inprogress .filepicker-container {display:none;}
+ .filepicker-filelist.dndupload-inprogress a {display:none;}
  
  /*
   * Select Dialogue (File Manager only)