From f9f8a6af6e9225676f880c745d4844addc7c9474 Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Fri, 30 Nov 2012 14:32:46 +0800 Subject: [PATCH 1/2] MDL-36777 usability: New icons for backup --- pix/i/configlock.png | Bin 0 -> 388 bytes pix/i/configlock.svg | 21 +++++++++++++++++++++ pix/i/hierarchylock.png | Bin 0 -> 306 bytes pix/i/hierarchylock.svg | 17 +++++++++++++++++ pix/i/permissionlock.png | Bin 0 -> 311 bytes pix/i/permissionlock.svg | 17 +++++++++++++++++ 6 files changed, 55 insertions(+) create mode 100644 pix/i/configlock.png create mode 100644 pix/i/configlock.svg create mode 100644 pix/i/hierarchylock.png create mode 100644 pix/i/hierarchylock.svg create mode 100644 pix/i/permissionlock.png create mode 100644 pix/i/permissionlock.svg diff --git a/pix/i/configlock.png b/pix/i/configlock.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2ee7c06af04f743b2863f78230793f0fc60535 GIT binary patch literal 388 zcmV-~0ek+5P)D2JpnwzE(~rVOoZ7$J75NW%S`YMN&qi<=t@3?2`|tkw2(h%l3akwfD7jb zoh#j0KcoaFz5G`h6mw6Yp8J0!=oJ$(u}zXbT-gNFI)6g1dYPCn+3U=V%1ez`E{6T1 zf|z)#M|b(VS~a1wsV>U@W-=x?sQ=N$o)NrEY^(gzkj<92IX4ViYR + + +]> + + + + + diff --git a/pix/i/hierarchylock.png b/pix/i/hierarchylock.png new file mode 100644 index 0000000000000000000000000000000000000000..c3cffd4468e62266dec5a786ad27f70a01183f99 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xu6VjQhE&{2N;trrc5aTPe8>04!G}BCH#1Gx#sAc5+4AM` z2bT45_CNe;aib-+AMPEaatn`8&Ki1H$*Z7g?EoXk=YgU@!KZdr>Ca%{d&r{Hzfb1`oT+7ZlqkZ2ZW$ zttG@iWy;}20<0Szc$D&72>H&a`|IA~c1DK=Muz1@PS! + + +]> + + + + + diff --git a/pix/i/permissionlock.png b/pix/i/permissionlock.png new file mode 100644 index 0000000000000000000000000000000000000000..ce2dafe9e21d8228c6b084f3297ffbc45cf21765 GIT binary patch literal 311 zcmV-70m%M|P)_T){yhO00@nI$3h;v*U9k$c!;NxE^RJ + + +]> + + + + + From d9f95015f50f59613eb53efee7baad21236f0c17 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 29 Nov 2012 14:08:43 +0800 Subject: [PATCH 2/2] MDL-36777 usability: Theming fixes on backup steps --- backup/moodle2/backup_activity_task.class.php | 3 ++- backup/moodle2/restore_activity_task.class.php | 3 ++- backup/util/ui/backup_ui_setting.class.php | 8 ++++---- backup/util/ui/renderer.php | 4 ++-- theme/base/style/core.css | 3 +++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/backup/moodle2/backup_activity_task.class.php b/backup/moodle2/backup_activity_task.class.php index a5974259534..a1ada38214f 100644 --- a/backup/moodle2/backup_activity_task.class.php +++ b/backup/moodle2/backup_activity_task.class.php @@ -258,7 +258,8 @@ abstract class backup_activity_task extends backup_task { // - section_included setting (if exists) $settingname = $settingprefix . 'included'; $activity_included = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true); - $activity_included->get_ui()->set_icon(new pix_icon('icon', get_string('pluginname', $this->modulename), $this->modulename)); + $activity_included->get_ui()->set_icon(new pix_icon('icon', get_string('pluginname', $this->modulename), + $this->modulename, array('class' => 'iconlarge icon-post'))); $this->add_setting($activity_included); // Look for "activities" root setting $activities = $this->plan->get_setting('activities'); diff --git a/backup/moodle2/restore_activity_task.class.php b/backup/moodle2/restore_activity_task.class.php index 5838a8e2069..cac682493ae 100644 --- a/backup/moodle2/restore_activity_task.class.php +++ b/backup/moodle2/restore_activity_task.class.php @@ -278,7 +278,8 @@ abstract class restore_activity_task extends restore_task { // - section_included setting (if exists) $settingname = $settingprefix . 'included'; $activity_included = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true); - $activity_included->get_ui()->set_icon(new pix_icon('icon', get_string('pluginname', $this->modulename), $this->modulename)); + $activity_included->get_ui()->set_icon(new pix_icon('icon', get_string('pluginname', $this->modulename), + $this->modulename, array('class' => 'iconlarge icon-post'))); $this->add_setting($activity_included); // Look for "activities" root setting $activities = $this->plan->get_setting('activities'); diff --git a/backup/util/ui/backup_ui_setting.class.php b/backup/util/ui/backup_ui_setting.class.php index c778fb7130e..e660c4a4c0b 100644 --- a/backup/util/ui/backup_ui_setting.class.php +++ b/backup/util/ui/backup_ui_setting.class.php @@ -329,7 +329,7 @@ class backup_setting_ui_text extends backup_setting_ui { $icon = $this->get_icon(); $label = $this->get_label($task); if (!empty($icon)) { - $label .= ' '.$output->render($icon); + $label .= $output->render($icon); } // name, label, attributes return $this->apply_options(array('element'=>'text','name'=>self::NAME_PREFIX.$this->name, 'label'=>$label, 'attributes'=>$this->attributes)); @@ -380,7 +380,7 @@ class backup_setting_ui_checkbox extends backup_setting_ui { $icon = $this->get_icon(); $label = $this->get_label($task); if (!empty($icon)) { - $label .= ' '.$output->render($icon); + $label .= $output->render($icon); } return $this->apply_options(array('element'=>'checkbox','name'=>self::NAME_PREFIX.$this->name, 'label'=>$label, 'text'=>$this->text, 'attributes'=>$this->attributes)); } @@ -473,7 +473,7 @@ class backup_setting_ui_radio extends backup_setting_ui { $icon = $this->get_icon(); $label = $this->get_label($task); if (!empty($icon)) { - $label .= ' '.$output->render($icon); + $label .= $output->render($icon); } // name, label, text, value, attributes return $this->apply_options(array('element'=>'radio','name'=>self::NAME_PREFIX.$this->name, 'label'=>$label, 'text'=>$this->text, 'value'=>$this->value, 'attributes'=>$this->attributes)); @@ -538,7 +538,7 @@ class backup_setting_ui_select extends backup_setting_ui { $icon = $this->get_icon(); $label = $this->get_label($task); if (!empty($icon)) { - $label .= ' '.$output->render($icon); + $label .= $output->render($icon); } // name, label, options, attributes return $this->apply_options(array('element'=>'select','name'=>self::NAME_PREFIX.$this->name, 'label'=>$label, 'options'=>$this->values, 'attributes'=>$this->attributes)); diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index c58f3677787..7b8dfe2847c 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -147,9 +147,9 @@ class core_backup_renderer extends plugin_renderer_base { $table->data = array(); } $name = get_string('pluginname', $activity->modulename); - $icon = new pix_icon('icon', $name, $activity->modulename); + $icon = new pix_icon('icon', $name, $activity->modulename, array('class' => 'iconlarge icon-pre')); $table->data[] = array( - $this->output->render($icon).' '.$name, + $this->output->render($icon).$name, $activity->title, ($activity->settings[$activitykey.'_userinfo'])?$yestick:$notick, ); diff --git a/theme/base/style/core.css b/theme/base/style/core.css index b1827bbab5c..57749318240 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -504,6 +504,9 @@ body.tag .managelink {padding: 5px;} .path-backup .backup_progress span.backup_stage.backup_stage_complete {color:inherit;} #page-backup-restore .filealiasesfailures {background-color:#ffd3d9} #page-backup-restore .filealiasesfailures .aliaseslist {width:90%;margin:0.8em auto;background-color:white;border:1px dotted #666;} +.path-backup .fitemtitle .iconlarge.icon-post { padding-left: 6px; } +.path-backup.dir-rtl .fitemtitle .iconlarge.icon-post { padding-right: 6px; padding-right: 0; } +.path-backup .fitem .smallicon { vertical-align: text-bottom; } /** * Web Service