L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-36777-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Aparup Banerjee
2012-12-03 14:59:15 +08:00
parent e1c93ed97b d9f95015f5
commit ce84cbacb7
11 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/moodle2/backup_activity_task.class.php
+2 -1
View File
@@ -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');
backup/moodle2/restore_activity_task.class.php
+2 -1
View File
@@ -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');
backup/util/ui/backup_ui_setting.class.php
+4 -4
View File
@@ -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));
backup/util/ui/renderer.php
+2 -2
View File
@@ -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,
);
pix/i/configlock.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 388 B

pix/i/configlock.svg
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M6,13.7c0-0.1-0.6-0.2-0.9-0.4l-1.8,1.2C2.6,14,2,13.4,1.5,12.6l1.2-1.8c-0.2-0.4-0.4-0.8-0.5-1.2
L0.1,9.3C0,8.9,0,8.4,0,8c0-0.4,0-0.9,0.1-1.3l2.1-0.4c0.1-0.4,0.3-0.8,0.5-1.2L1.5,3.4C2,2.6,2.6,2,3.4,1.5l1.8,1.2
c0.4-0.2,0.8-0.4,1.2-0.5l0.4-2.1C7.1,0,7.6,0,8,0s0.9,0,1.3,0.1l0.4,2.1c0.4,0.1,0.8,0.3,1.2,0.5l1.8-1.2C13.4,2,14,2.6,14.5,3.4
l-1.2,1.8c0.2,0.4,0.4,0.8,0.5,1.2l2.1,0.4C16,7.1,16,7.6,16,8s0,0.9-0.1,1.3l-0.4,0.1c-0.1-0.8-0.5-1.6-1.1-2.2
C13.6,6.4,12.6,6,11.6,6c-0.8,0-1.5,0.2-2.1,0.6C9.1,6.2,8.6,6,8,6C6.9,6,6.1,6.9,6.1,8c0,1,0.6,1.7,1.5,1.9c0,0,0,0.2,0,0.2
c-0.4,0.1-0.7,0.3-1,0.5C6.2,11,6,11.5,6,12V13.7z M14.5,10v1H15c0.5,0,1,0.5,1,1v3c0,0.5-0.5,1-1,1l-7,0c-0.5,0-1-0.5-1-1v-3
c0-0.5,0.4-1,1-1h0.6v-1c0-1.6,1.3-3,2.9-3C13.2,7,14.5,8.4,14.5,10z M11.5,12c-0.5,0-1,0.4-1,1c0,0.4,0.2,0.7,0.6,0.9L11,14l-0.5,1
l1,0l1,0L12,14L12,13.9c0.3-0.2,0.6-0.5,0.6-0.9C12.5,12.5,12.1,12,11.5,12z M11.5,9c-0.5,0-1,0.4-1,1v1h1.9v-1
C12.5,9.5,12.1,9,11.5,9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

pix/i/hierarchylock.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 306 B

pix/i/hierarchylock.svg
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M5.9,15c0,0.3,0.1,1,0.3,1H0.6c-0.5,0-0.8-0.4-0.5-0.9L1.7,12h4.3c0,0,0,0,0,0V15z M4.2,7l-2,4h4.1
c0.1-0.2,0.2-0.3,0.4-0.5C7,10.2,7.5,10,7.5,10c0-1.2,0.3-2.1,1.3-3c0,0,0,0,0.1-0.1H4.2z M11.3,6L8.4,0.4c-0.2-0.5-0.7-0.5-0.9,0
L4.7,6H11.3z M14.4,10v1H15c0.5,0,1,0.5,1,1v3c0,0.5-0.5,1-1,1l-7,0c-0.5,0-1-0.5-1-1v-3c0-0.5,0.4-1,1-1h0.6v-1c0-1.6,1.3-3,2.9-3
C13.1,7,14.4,8.3,14.4,10z M11.5,12c-0.5,0-1,0.4-1,1c0,0.4,0.2,0.7,0.6,0.9L11,14l-0.5,1l1,0l1,0L12,14l-0.1-0.1
c0.3-0.2,0.6-0.5,0.6-0.9C12.5,12.5,12,12,11.5,12z M11.5,9c-0.5,0-1,0.4-1,1v1h1.9v-1C12.4,9.4,12,9,11.5,9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

pix/i/permissionlock.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 311 B

pix/i/permissionlock.svg
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M2.4,9C2.4,9,1,7.2,1,5.2C1,2.3,2.8,0,5,0s4,2.3,4,5.2C9,7.2,7.6,9,7.6,9c-0.3,0.3-0.2,0.7,0,1
c-0.4,0.1-0.7,0.3-1,0.5C6.2,10.9,6,11.4,6,12v3c0,0.3,0.1,0.7,0.3,1H0v-4.5l2.2-1.2C2.7,10,2.8,9.5,2.4,9z M14.5,10v1H15
c0.5,0,1,0.5,1,1v3c0,0.5-0.5,1-1,1l-7,0c-0.5,0-1-0.5-1-1v-3c0-0.5,0.4-1,1-1h0.6v-1c0-1.6,1.3-3,2.9-3C13.2,7,14.5,8.3,14.5,10z
M11.5,12c-0.5,0-1,0.4-1,1c0,0.4,0.2,0.7,0.6,0.9L11,14l-0.5,1l1,0l1,0L12,14L12,13.9c0.3-0.2,0.6-0.5,0.6-0.9
C12.5,12.4,12.1,12,11.5,12z M11.5,9c-0.5,0-1,0.4-1,1v1h1.9v-1C12.5,9.4,12.1,9,11.5,9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

theme/base/style/core.css
+3
View File
@@ -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