From 88d366e5952a6ea7b53ef9722b5db95aef875410 Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Fri, 17 Jan 2014 11:23:59 +0800 Subject: [PATCH] MDL-38903 File picker: making upload form with more semantic HTML --- files/renderer.php | 432 +++++++++++------- lang/en/repository.php | 19 +- .../lang/en/repository_flickr_public.php | 2 +- repository/flickr_public/lib.php | 2 +- theme/base/style/filemanager.css | 21 +- .../less/moodle/filemanager.less | 57 ++- .../bootstrapbase/less/moodle/responsive.less | 27 +- theme/bootstrapbase/style/moodle.css | 4 +- 8 files changed, 386 insertions(+), 178 deletions(-) diff --git a/files/renderer.php b/files/renderer.php index 6c97879e5bf..18d1a641ab5 100644 --- a/files/renderer.php +++ b/files/renderer.php @@ -201,18 +201,30 @@ class core_files_renderer extends plugin_renderer_base {
-
-
-
+
+ +
+
+ +
+
+ +
-
- - - +
- +
'.$icon_progress.'
@@ -249,17 +261,17 @@ class core_files_renderer extends plugin_renderer_base { '; - return preg_replace('/\{\!\}/', '', $rv); + return $rv; } /** @@ -279,14 +291,14 @@ class core_files_renderer extends plugin_renderer_base { $rv = ' - + - + - '.$this->pix_icon('i/menu', '▶').' + '.$this->pix_icon('i/menu', '▶').' '; - return preg_replace('/\{\!\}/', '', $rv); + return $rv; } /** @@ -309,10 +321,10 @@ class core_files_renderer extends plugin_renderer_base {
- - + + '; - return preg_replace('/\{\!\}/', '', $rv); + return $rv; } /** @@ -369,50 +381,78 @@ class core_files_renderer extends plugin_renderer_base { private function fm_js_template_fileselectlayout() { global $OUTPUT; $strloading = get_string('loading', 'repository'); - $icon_progress = $this->pix_icon('i/loading_small', $strloading).''; + $iconprogress = $this->pix_icon('i/loading_small', $strloading).''; $rv = '
-
- - - '.$OUTPUT->help_icon('setmainfile', 'repository').' - - + + + + + '.$OUTPUT->help_icon('setmainfile', 'repository').' + +
- - - - - - - - - - - - - -
:
:
:
:
:'.$icon_progress.' '.$strloading.'
:

'.$icon_progress.' '.$strloading.'
    + +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + '.$iconprogress.' '.$strloading.' +
    +
    +
    + +
    +

    + '.$iconprogress.' '.$strloading.' +
      +
      +
      +
      - - + +
      -

      +

      -
      '.get_string('lastmodified', 'moodle').':
      -
      '.get_string('datecreated', 'repository').':
      -
      '.get_string('size', 'repository').':
      -
      '.get_string('dimensions', 'repository').':
      +
      '.get_string('lastmodified', 'repository').'
      +
      '.get_string('datecreated', 'repository').'
      +
      '.get_string('size', 'repository').'
      +
      '.get_string('dimensions', 'repository').'
      '; - return preg_replace('/\{\!\}/', '', $rv); + return $rv; } /** @@ -429,11 +469,11 @@ class core_files_renderer extends plugin_renderer_base { private function fm_js_template_confirmdialog() { $rv = '
      -
      - - +
      + +
      '; - return preg_replace('/\{\!\}/', '', $rv); + return $rv; } /** @@ -525,36 +565,64 @@ class core_files_renderer extends plugin_renderer_base {