Merge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 07:21:25 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 07:21:25 +0000 (15:21 +0800)
81 files changed:
admin/renderer.php
backup/moodle2/backup_activity_task.class.php
backup/moodle2/restore_activity_task.class.php
backup/util/ui/backup_ui_setting.class.php
backup/util/ui/renderer.php
course/dndupload.js
lib/outputlib.php
mod/assign/upgradelib.php
pix/c/course.png [new file with mode: 0644]
pix/c/course.svg [new file with mode: 0644]
pix/c/group.png [new file with mode: 0644]
pix/c/group.svg [new file with mode: 0644]
pix/c/site.png [new file with mode: 0644]
pix/c/site.svg [new file with mode: 0644]
pix/c/user.png [new file with mode: 0644]
pix/c/user.svg [new file with mode: 0644]
pix/i/approve.png [new file with mode: 0644]
pix/i/approve.svg [new file with mode: 0644]
pix/i/calendar.png [new file with mode: 0644]
pix/i/calendar.svg [new file with mode: 0644]
pix/i/configlock.png [new file with mode: 0644]
pix/i/configlock.svg [new file with mode: 0644]
pix/i/cross_red_big.png [new file with mode: 0644]
pix/i/cross_red_big.svg [new file with mode: 0644]
pix/i/cross_red_small.png [new file with mode: 0644]
pix/i/cross_red_small.svg [new file with mode: 0644]
pix/i/db.png [new file with mode: 0644]
pix/i/db.svg [new file with mode: 0644]
pix/i/files.png [new file with mode: 0644]
pix/i/files.svg [new file with mode: 0644]
pix/i/hierarchylock.png [new file with mode: 0644]
pix/i/hierarchylock.svg [new file with mode: 0644]
pix/i/permissionlock.png [new file with mode: 0644]
pix/i/permissionlock.svg [new file with mode: 0644]
pix/i/reload.png [new file with mode: 0644]
pix/i/reload.svg [new file with mode: 0644]
pix/i/risk_config.png [new file with mode: 0644]
pix/i/risk_config.svg [new file with mode: 0644]
pix/i/risk_dataloss.png [new file with mode: 0644]
pix/i/risk_dataloss.svg [new file with mode: 0644]
pix/i/risk_managetrust.png [new file with mode: 0644]
pix/i/risk_managetrust.svg [new file with mode: 0644]
pix/i/risk_personal.png [new file with mode: 0644]
pix/i/risk_personal.svg [new file with mode: 0644]
pix/i/risk_spam.png [new file with mode: 0644]
pix/i/risk_spam.svg [new file with mode: 0644]
pix/i/risk_xss.png [new file with mode: 0644]
pix/i/risk_xss.svg [new file with mode: 0644]
pix/i/roles.png [new file with mode: 0644]
pix/i/roles.svg [new file with mode: 0644]
pix/i/search.png [new file with mode: 0644]
pix/i/search.svg [new file with mode: 0644]
pix/i/switchrole.png
pix/i/switchrole.svg
pix/i/tick_amber_big.png [new file with mode: 0644]
pix/i/tick_amber_big.svg [new file with mode: 0644]
pix/i/tick_amber_small.png [new file with mode: 0644]
pix/i/tick_amber_small.svg [new file with mode: 0644]
pix/i/tick_green_big.png [new file with mode: 0644]
pix/i/tick_green_big.svg [new file with mode: 0644]
pix/i/tick_green_small.png [new file with mode: 0644]
pix/i/tick_green_small.svg [new file with mode: 0644]
pix/t/addgreen.png [new file with mode: 0644]
pix/t/addgreen.svg [new file with mode: 0644]
pix/t/clear.png [new file with mode: 0644]
pix/t/clear.svg [new file with mode: 0644]
pix/t/manual_item.png [new file with mode: 0644]
pix/t/manual_item.svg [new file with mode: 0644]
pix/t/unlock_gray.png [new file with mode: 0644]
pix/t/unlock_gray.svg [new file with mode: 0644]
pix/t/user.png [new file with mode: 0644]
pix/t/user.svg [new file with mode: 0644]
pix/t/userblue.png [new file with mode: 0644]
pix/t/userblue.svg [new file with mode: 0644]
theme/base/style/core.css
theme/mymobile/javascript/custom.js
theme/mymobile/javascript/jquery.mobile-1.1.1.js
theme/mymobile/readme_moodle.txt [new file with mode: 0644]
theme/mymobile/style/core.css
theme/styles.php
theme/styles_debug.php

index 5767d7f..8d49636 100644 (file)
@@ -691,7 +691,7 @@ class core_admin_renderer extends plugin_renderer_base {
     function upgrade_reload($url) {
         return html_writer::empty_tag('br') .
                 html_writer::tag('div',
-                    html_writer::link($url, $this->pix_icon('i/reload', '') .
+                    html_writer::link($url, $this->pix_icon('i/reload', '', '', array('class' => 'icon icon-pre')) .
                             get_string('reload'), array('title' => get_string('reload'))),
                 array('class' => 'continuebutton')) . html_writer::empty_tag('br');
     }
index a597425..a1ada38 100644 (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');
index 5838a8e..cac6824 100644 (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');
index c778fb7..e660c4a 100644 (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 .= '&nbsp;'.$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 .= '&nbsp;'.$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 .= '&nbsp;'.$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 .= '&nbsp;'.$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));
index c58f367..7b8dfe2 100644 (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).'&nbsp;'.$name,
+                        $this->output->render($icon).$name,
                         $activity->title,
                         ($activity->settings[$activitykey.'_userinfo'])?$yestick:$notick,
                     );
index e1d1b11..d41bfe9 100644 (file)
@@ -442,6 +442,7 @@ M.course_dndupload = {
             parent: modsel,
             li: document.createElement('li'),
             div: document.createElement('div'),
+            indentdiv: document.createElement('div'),
             a: document.createElement('a'),
             icon: document.createElement('img'),
             namespan: document.createElement('span'),
@@ -452,24 +453,23 @@ M.course_dndupload = {
 
         resel.li.className = 'activity resource modtype_resource';
 
-        resel.div.className = 'mod-indent';
-        resel.li.appendChild(resel.div);
+        resel.indentdiv.className = 'mod-indent';
+        resel.li.appendChild(resel.indentdiv);
+
+        resel.div.className = 'activityinstance';
+        resel.indentdiv.appendChild(resel.div);
 
         resel.a.href = '#';
         resel.div.appendChild(resel.a);
 
         resel.icon.src = M.util.image_url('i/ajaxloader');
-        resel.icon.className = 'activityicon';
+        resel.icon.className = 'activityicon iconlarge';
         resel.a.appendChild(resel.icon);
 
-        resel.a.appendChild(document.createTextNode(' '));
-
         resel.namespan.className = 'instancename';
         resel.namespan.innerHTML = name;
         resel.a.appendChild(resel.namespan);
 
-        resel.div.appendChild(document.createTextNode(' '));
-
         resel.groupingspan.className = 'groupinglabel';
         resel.div.appendChild(resel.groupingspan);
 
@@ -738,7 +738,7 @@ M.course_dndupload = {
 
                             resel.div.removeChild(resel.progressouter);
                             resel.li.id = result.elementid;
-                            resel.div.innerHTML += result.commands;
+                            resel.indentdiv.innerHTML += result.commands;
                             if (result.onclick) {
                                 resel.a.onclick = result.onclick;
                             }
index da1761b..15b772f 100644 (file)
@@ -618,20 +618,34 @@ class theme_config {
 
         $urls = array();
 
+        $svg = $this->use_svg_icons();
+
         if ($rev > -1) {
+            $url = new moodle_url("$CFG->httpswwwroot/theme/styles.php");
             if (check_browser_version('MSIE', 5)) {
                 // We need to split the CSS files for IE
-                $urls[] = new moodle_url($CFG->httpswwwroot.'/theme/styles.php', array('theme'=>$this->name,'rev'=>$rev, 'type'=>'plugins'));
-                $urls[] = new moodle_url($CFG->httpswwwroot.'/theme/styles.php', array('theme'=>$this->name,'rev'=>$rev, 'type'=>'parents'));
-                $urls[] = new moodle_url($CFG->httpswwwroot.'/theme/styles.php', array('theme'=>$this->name,'rev'=>$rev, 'type'=>'theme'));
+                $urls[] = new moodle_url($url, array('theme' => $this->name,'rev' => $rev, 'type' => 'plugins', 'svg' => '0'));
+                $urls[] = new moodle_url($url, array('theme' => $this->name,'rev' => $rev, 'type' => 'parents', 'svg' => '0'));
+                $urls[] = new moodle_url($url, array('theme' => $this->name,'rev' => $rev, 'type' => 'theme', 'svg' => '0'));
             } else {
                 if (!empty($CFG->slasharguments)) {
-                    $url = new moodle_url("$CFG->httpswwwroot/theme/styles.php");
-                    $url->set_slashargument('/'.$this->name.'/'.$rev.'/all', 'noparam', true);
-                    $urls[] = $url;
+                    $slashargs = '/'.$this->name.'/'.$rev.'/all';
+                    if (!$svg) {
+                        // We add a simple /_s to the start of the path.
+                        // The underscore is used to ensure that it isn't a valid theme name.
+                        $slashargs = '/_s'.$slashargs;
+                    }
+                    $url->set_slashargument($slashargs, 'noparam', true);
                 } else {
-                    $urls[] = new moodle_url($CFG->httpswwwroot.'/theme/styles.php', array('theme'=>$this->name,'rev'=>$rev, 'type'=>'all'));
+                    $params = array('theme' => $this->name,'rev' => $rev, 'type' => 'all');
+                    if (!$svg) {
+                        // We add an SVG param so that we know not to serve SVG images.
+                        // We do this because all modern browsers support SVG and this param will one day be removed.
+                        $params['svg'] = '0';
+                    }
+                    $url->params($params);
                 }
+                $urls[] = $url;
             }
         } else {
             // find out the current CSS and cache it now for 5 seconds
@@ -641,7 +655,11 @@ class theme_config {
                 define('THEME_DESIGNER_CACHE_LIFETIME', 4); // this can be also set in config.php
             }
             $candidatedir = "$CFG->cachedir/theme/$this->name";
-            $candidatesheet = "$candidatedir/designer.ser";
+            if ($svg) {
+                $candidatesheet = "$candidatedir/designer.ser";
+            } else {
+                $candidatesheet = "$candidatedir/designer_nosvg.ser";
+            }
             $rebuild = true;
             if (file_exists($candidatesheet) and filemtime($candidatesheet) > time() - THEME_DESIGNER_CACHE_LIFETIME) {
                 if ($css = file_get_contents($candidatesheet)) {
@@ -674,8 +692,12 @@ class theme_config {
                 ignore_user_abort($prevabort);
             }
 
-            $baseurl = $CFG->httpswwwroot.'/theme/styles_debug.php';
-
+            $baseurl = new moodle_url($CFG->httpswwwroot.'/theme/styles_debug.php');
+            if (!$svg) {
+                // We add an SVG param so that we know not to serve SVG images.
+                // We do this because all modern browsers support SVG and this param will one day be removed.
+                $baseurl->param('svg', '0');
+            }
             if (check_browser_version('MSIE', 5)) {
                 // lalala, IE does not allow more than 31 linked CSS files from main document
                 $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'plugins'));
@@ -948,12 +970,6 @@ class theme_config {
     public function post_process($css) {
         // now resolve all image locations
         if (preg_match_all('/\[\[pix:([a-z_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
-            // We are going to disable the use of SVG images when available in CSS background-image properties
-            // as support for it in browsers is at best quirky.
-            // When we choose to support SVG in background css we will need to remove this code and implement a solution that is
-            // either consistent or varies the URL for serving CSS depending upon SVG being used if available, or not.
-            $originalsvguse = $this->use_svg_icons();
-            $this->force_svg_use(false);
             $replaced = array();
             foreach ($matches as $match) {
                 if (isset($replaced[$match[0]])) {
@@ -967,7 +983,6 @@ class theme_config {
                 $imageurl = preg_replace('|^http.?://[^/]+|', '', $imageurl);
                 $css = str_replace($match[0], $imageurl, $css);
             }
-            $this->force_svg_use($originalsvguse);
         }
 
         // now resolve all theme settings or do any other postprocessing
@@ -1145,10 +1160,11 @@ class theme_config {
      * Forces the usesvg setting to either true or false, avoiding any decision making.
      *
      * This function should only ever be used when absolutely required, and before any generation of image URL's has occurred.
+     * DO NOT ABUSE THIS FUNCTION... not that you'd want to right ;)
      *
      * @param bool $setting True to force the use of svg when available, null otherwise.
      */
-    private function force_svg_use($setting) {
+    public function force_svg_use($setting) {
         $this->usesvg = (bool)$setting;
     }
 
index ff6ee6d..38e243d 100644 (file)
@@ -238,14 +238,12 @@ class assign_upgrade_manager {
 
             $newassignment->update_calendar($newcoursemodule->id);
 
-            // copy the grades from the old assignment to the new one
+            // Reassociate grade_items from the old assignment instance to the new assign instance.
+            // This includes outcome linked grade_items.
+            $params = array('assign', $newassignment->get_instance()->id, 'assignment', $oldassignment->id);
+            $sql = 'UPDATE {grade_items} SET itemmodule = ?, iteminstance = ? WHERE itemmodule = ? AND iteminstance = ?';
+            $DB->execute($sql, $params);
 
-            $gradeitem = $DB->get_record('grade_items', array('iteminstance'=>$oldassignment->id, 'itemmodule'=>'assignment'), 'id', IGNORE_MISSING);
-            if ($gradeitem) {
-                $gradeitem->iteminstance = $newassignment->get_instance()->id;
-                $gradeitem->itemmodule = 'assign';
-                $DB->update_record('grade_items', $gradeitem);
-            }
             $gradesdone = true;
 
         } catch (Exception $exception) {
@@ -256,13 +254,10 @@ class assign_upgrade_manager {
         if ($rollback) {
             // roll back the grades changes
             if ($gradesdone) {
-                // copy the grades from the old assignment to the new one
-                $gradeitem = $DB->get_record('grade_items', array('iteminstance'=>$newassignment->get_instance()->id, 'itemmodule'=>'assign'), 'id', IGNORE_MISSING);
-                if ($gradeitem) {
-                    $gradeitem->iteminstance = $oldassignment->id;
-                    $gradeitem->itemmodule = 'assignment';
-                    $DB->update_record('grade_items', $gradeitem);
-                }
+                // Reassociate grade_items from the new assign instance to the old assignment instance.
+                $params = array('assignment', $oldassignment->id, 'assign', $newassignment->get_instance()->id);
+                $sql = 'UPDATE {grade_items} SET itemmodule = ?, iteminstance = ? WHERE itemmodule = ? AND iteminstance = ?';
+                $DB->execute($sql, $params);
             }
             // roll back the completion changes
             if ($completiondone) {
diff --git a/pix/c/course.png b/pix/c/course.png
new file mode 100644 (file)
index 0000000..4f86f2c
Binary files /dev/null and b/pix/c/course.png differ
diff --git a/pix/c/course.svg b/pix/c/course.svg
new file mode 100644 (file)
index 0000000..171d782
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.2 0 16 16" style="overflow:visible;enable-background:new -0.2 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M6,0.4c0.4-0.1,0.8-0.1,1.3-0.1c1.5,0,3,0.5,4.2,1.4c-0.6,0.2-1.2,0.5-1.7,1C9.7,2.7,9.6,2.8,9.6,2.8\r
+       C8.9,2.5,8.1,2.2,7.2,2.2c-0.1,0-0.2,0-0.3,0C6.8,1.6,6.5,0.9,6,0.4z M11.7,9.4c-0.2,0.5-0.5,1-1,1.4c-0.3,0.3-0.8,0.6-1.2,0.8\r
+       c0.2,0.7,0.3,1.4,0.1,2.2c0.9-0.3,1.8-0.9,2.5-1.6c0.9-0.9,1.4-1.9,1.8-3C13.2,9.5,12.5,9.5,11.7,9.4z M3,10.1C3,10,3.1,10,3,10.1\r
+       C2.5,9.1,2.2,8,2.3,6.9C1.6,6.8,0.9,6.5,0.4,6C0,8,0.5,10.2,2,11.9C2.2,11.2,2.5,10.6,3,10.1z M10.4,3.4c-1.2,1.2-1.2,3.1,0,4.2\r
+       c1.2,1.2,3.1,1.2,4.2,0s1.2-3.1,0-4.2C13.5,2.2,11.6,2.2,10.4,3.4z M3.7,10.8c-1.2,1.2-1.2,3.1,0,4.2c1.2,1.2,3.1,1.2,4.2,0\r
+       c1.2-1.2,1.2-3.1,0-4.2C6.8,9.6,4.9,9.6,3.7,10.8z M0.9,0.9c-1.2,1.2-1.2,3.1,0,4.2C2,6.3,4,6.3,5.1,5.1c1.2-1.2,1.2-3.1,0-4.2\r
+       C4-0.3,2-0.3,0.9,0.9z"/>\r
+</svg>\r
diff --git a/pix/c/group.png b/pix/c/group.png
new file mode 100644 (file)
index 0000000..393371b
Binary files /dev/null and b/pix/c/group.png differ
diff --git a/pix/c/group.svg b/pix/c/group.svg
new file mode 100644 (file)
index 0000000..7107000
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M3,16H0v-4l3.2-1.7C3.6,10,3.8,9.5,3.4,9C3.4,9,2,7.2,2,5.2C2,2.3,3.8,0,6,0c0.4,0,0.7,0.1,1.1,0.2\r
+       c-1.2,1.1-2,3-2,5c0,1.7,0.6,2.7,1,3.5c0.6,0.9,0.1,1-0.3,1.3C5.6,10.1,3,11.4,3,11.4V16z M16,11.9l-3.1-1.6\r
+       C12.4,10,12.3,9.4,12.6,9c0,0,1.4-1.8,1.4-3.8C14,2.3,12.2,0,10,0S6,2.3,6,5.2C6,7.2,7.5,9,7.5,9c0.3,0.4,0.2,1-0.3,1.3L4,12v4h12\r
+       V11.9z"/>\r
+</svg>\r
diff --git a/pix/c/site.png b/pix/c/site.png
new file mode 100644 (file)
index 0000000..02a18b5
Binary files /dev/null and b/pix/c/site.png differ
diff --git a/pix/c/site.svg b/pix/c/site.svg
new file mode 100644 (file)
index 0000000..061d4bb
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M14,1h-2v1.5C12,3.3,11.3,4,10.5,4S9,3.3,9,2.5V1H6v1.5C6,3.3,5.3,4,4.5,4S3,3.3,3,2.5V1H1\r
+       C0.4,1,0,1.4,0,2v13c0,0.6,0.4,1,1,1h13c0.6,0,1-0.4,1-1V2C15,1.4,14.6,1,14,1z M4,14H2v-2h2V14z M4,11H2V9h2V11z M4,8H2V6h2V8z\r
+        M7,14H5v-2h2V14z M7,11H5V9h2V11z M7,8H5V6h2V8z M10,14H8v-2h2V14z M10,11H8V9h2V11z M10,8H8V6h2V8z M13,14h-2v-2h2V14z M13,11h-2\r
+       V9h2V11z M13,8h-2V6h2V8z M5,2.5C5,2.8,4.8,3,4.5,3l0,0C4.2,3,4,2.8,4,2.5v-2C4,0.2,4.2,0,4.5,0l0,0C4.8,0,5,0.2,5,0.5V2.5z M11,2.5\r
+       C11,2.8,10.8,3,10.5,3l0,0C10.2,3,10,2.8,10,2.5v-2C10,0.2,10.2,0,10.5,0l0,0C10.8,0,11,0.2,11,0.5V2.5z"/>\r
+</svg>\r
diff --git a/pix/c/user.png b/pix/c/user.png
new file mode 100644 (file)
index 0000000..f803c86
Binary files /dev/null and b/pix/c/user.png differ
diff --git a/pix/c/user.svg b/pix/c/user.svg
new file mode 100644 (file)
index 0000000..9fc0081
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M5.2,10.3L0,13.1V16h16v-3l-5.2-2.7C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0\r
+       S4,2.3,4,5.2C4,7.2,5.4,9,5.4,9C5.8,9.5,5.7,10,5.2,10.3z"/>\r
+</svg>\r
diff --git a/pix/i/approve.png b/pix/i/approve.png
new file mode 100644 (file)
index 0000000..43540a5
Binary files /dev/null and b/pix/i/approve.png differ
diff --git a/pix/i/approve.svg b/pix/i/approve.svg
new file mode 100644 (file)
index 0000000..b29d965
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M11.4,0.6l-0.9-0.5C10.1-0.1,9.5,0,9.2,0.5L4.7,8.2L2,6.6C1.5,6.3,0.9,6.5,0.6,7L0.1,7.8\r
+       C-0.1,8.3,0,8.9,0.5,9.2L5,11.8c0.1,0.1,0.3,0.1,0.4,0.1c0.4,0.1,0.8-0.1,1-0.5L11.8,2C12.1,1.5,11.9,0.9,11.4,0.6z"/>\r
+</svg>\r
diff --git a/pix/i/calendar.png b/pix/i/calendar.png
new file mode 100644 (file)
index 0000000..02a18b5
Binary files /dev/null and b/pix/i/calendar.png differ
diff --git a/pix/i/calendar.svg b/pix/i/calendar.svg
new file mode 100644 (file)
index 0000000..061d4bb
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M14,1h-2v1.5C12,3.3,11.3,4,10.5,4S9,3.3,9,2.5V1H6v1.5C6,3.3,5.3,4,4.5,4S3,3.3,3,2.5V1H1\r
+       C0.4,1,0,1.4,0,2v13c0,0.6,0.4,1,1,1h13c0.6,0,1-0.4,1-1V2C15,1.4,14.6,1,14,1z M4,14H2v-2h2V14z M4,11H2V9h2V11z M4,8H2V6h2V8z\r
+        M7,14H5v-2h2V14z M7,11H5V9h2V11z M7,8H5V6h2V8z M10,14H8v-2h2V14z M10,11H8V9h2V11z M10,8H8V6h2V8z M13,14h-2v-2h2V14z M13,11h-2\r
+       V9h2V11z M13,8h-2V6h2V8z M5,2.5C5,2.8,4.8,3,4.5,3l0,0C4.2,3,4,2.8,4,2.5v-2C4,0.2,4.2,0,4.5,0l0,0C4.8,0,5,0.2,5,0.5V2.5z M11,2.5\r
+       C11,2.8,10.8,3,10.5,3l0,0C10.2,3,10,2.8,10,2.5v-2C10,0.2,10.2,0,10.5,0l0,0C10.8,0,11,0.2,11,0.5V2.5z"/>\r
+</svg>\r
diff --git a/pix/i/configlock.png b/pix/i/configlock.png
new file mode 100644 (file)
index 0000000..5d2ee7c
Binary files /dev/null and b/pix/i/configlock.png differ
diff --git a/pix/i/configlock.svg b/pix/i/configlock.svg
new file mode 100644 (file)
index 0000000..caf0cf4
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+       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\r
+       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\r
+       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\r
+       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\r
+       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\r
+       C12.5,9.5,12.1,9,11.5,9z"/>\r
+</svg>\r
diff --git a/pix/i/cross_red_big.png b/pix/i/cross_red_big.png
new file mode 100644 (file)
index 0000000..0f5cfe0
Binary files /dev/null and b/pix/i/cross_red_big.png differ
diff --git a/pix/i/cross_red_big.svg b/pix/i/cross_red_big.svg
new file mode 100644 (file)
index 0000000..27d851b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-1.6 -0.5 16 16"\r
+        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FF403C;" d="M12.8,2.7L10.1,0c0,0-1.6,1.5-3.7,4C4.3,1.5,2.7,0,2.7,0L0,2.7c0,0,1.9,1.3,4.6,3.7\r
+       C3,8.7,1.3,11.6,0,14.9C2.2,12.2,4.4,9.9,6.4,8c2,1.9,4.2,4.2,6.4,6.9c-1.3-3.3-3-6.2-4.6-8.6C10.9,4,12.8,2.7,12.8,2.7z"/>\r
+</svg>\r
diff --git a/pix/i/cross_red_small.png b/pix/i/cross_red_small.png
new file mode 100644 (file)
index 0000000..0f5cfe0
Binary files /dev/null and b/pix/i/cross_red_small.png differ
diff --git a/pix/i/cross_red_small.svg b/pix/i/cross_red_small.svg
new file mode 100644 (file)
index 0000000..27d851b
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-1.6 -0.5 16 16"\r
+        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FF403C;" d="M12.8,2.7L10.1,0c0,0-1.6,1.5-3.7,4C4.3,1.5,2.7,0,2.7,0L0,2.7c0,0,1.9,1.3,4.6,3.7\r
+       C3,8.7,1.3,11.6,0,14.9C2.2,12.2,4.4,9.9,6.4,8c2,1.9,4.2,4.2,6.4,6.9c-1.3-3.3-3-6.2-4.6-8.6C10.9,4,12.8,2.7,12.8,2.7z"/>\r
+</svg>\r
diff --git a/pix/i/db.png b/pix/i/db.png
new file mode 100644 (file)
index 0000000..3e51209
Binary files /dev/null and b/pix/i/db.png differ
diff --git a/pix/i/db.svg b/pix/i/db.svg
new file mode 100644 (file)
index 0000000..7adaaab
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-2 -1 16 16" style="overflow:visible;enable-background:new -2 -1 16 16;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M12,11c0,1.2,0,2,0,2c0,1-2.7,1.9-6,1.9c-3.3,0-6-0.8-6-1.9c0,0,0-0.8,0-2c0,1,2.7,1.9,6,1.9\r
+       C9.3,12.9,12,12.1,12,11z M6,9.9C2.7,9.9,0,9.1,0,8c0,1.2,0,2,0,2c0,1,2.7,1.9,6,1.9c3.3,0,6-0.8,6-1.9c0,0,0-0.8,0-2\r
+       C12,9.1,9.3,9.9,6,9.9z M6,6.9C2.7,6.9,0,6.1,0,5c0,1.2,0,2,0,2c0,1,2.7,1.9,6,1.9c3.3,0,6-0.8,6-1.9c0,0,0-0.8,0-2\r
+       C12,6.1,9.3,6.9,6,6.9z M12,1.9C12,0.8,9.3,0,6,0C2.7,0,0,0.8,0,1.9C0,1.9,0,4,0,4c0,1,2.7,1.9,6,1.9c3.3,0,6-0.8,6-1.9\r
+       C12,4,12,1.9,12,1.9z"/>\r
+</svg>\r
diff --git a/pix/i/files.png b/pix/i/files.png
new file mode 100644 (file)
index 0000000..9d7534b
Binary files /dev/null and b/pix/i/files.png differ
diff --git a/pix/i/files.svg b/pix/i/files.svg
new file mode 100644 (file)
index 0000000..22966d6
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 -1.3 16 16" style="overflow:visible;enable-background:new 0 -1.3 16 16;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M8,2.5c-0.5,0-1-0.5-1-1V1c0-0.5-0.5-1-1-1H1C0.5,0,0,0.5,0,1v0.5c0,0.5,0,11,0,11c0,0.5,0.5,1,1,1\r
+       h14c0.5,0,1-0.5,1-1v-9c0-0.5-0.5-1-1-1H8z"/>\r
+</svg>\r
diff --git a/pix/i/hierarchylock.png b/pix/i/hierarchylock.png
new file mode 100644 (file)
index 0000000..c3cffd4
Binary files /dev/null and b/pix/i/hierarchylock.png differ
diff --git a/pix/i/hierarchylock.svg b/pix/i/hierarchylock.svg
new file mode 100644 (file)
index 0000000..d18f6e9
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        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;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+       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\r
+       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"/>\r
+</svg>\r
diff --git a/pix/i/permissionlock.png b/pix/i/permissionlock.png
new file mode 100644 (file)
index 0000000..ce2dafe
Binary files /dev/null and b/pix/i/permissionlock.png differ
diff --git a/pix/i/permissionlock.svg b/pix/i/permissionlock.svg
new file mode 100644 (file)
index 0000000..a3e6855
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+        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\r
+       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"/>\r
+</svg>\r
diff --git a/pix/i/reload.png b/pix/i/reload.png
new file mode 100644 (file)
index 0000000..9c849d1
Binary files /dev/null and b/pix/i/reload.png differ
diff --git a/pix/i/reload.svg b/pix/i/reload.svg
new file mode 100644 (file)
index 0000000..6bf89c5
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M7.9,16c4,0,7.4-3,7.8-7h-3c-0.5,2-2.5,4-4.9,4c-2.8,0-5-2.2-5-5c0-2.8,2.2-5,5-5c1.1,0,2.1,0,3,1h-1\r
+       C9.3,4,9,4.5,9,5.1v1C9,6.6,9.3,7,9.8,7h4h1C15.4,7,16,6.6,16,6.1v-1v-4C16,0.5,15.4,0,14.8,0h-1C13.3,0,13,0.5,13,1.1v0.9\r
+       c-1-1.1-3.1-1.8-5-1.8C3.6,0.2,0,3.7,0,8.1C0,12.4,3.5,16,7.9,16z"/>\r
+</svg>\r
diff --git a/pix/i/risk_config.png b/pix/i/risk_config.png
new file mode 100644 (file)
index 0000000..00d0d83
Binary files /dev/null and b/pix/i/risk_config.png differ
diff --git a/pix/i/risk_config.svg b/pix/i/risk_config.svg
new file mode 100644 (file)
index 0000000..ea89889
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#99CC33;" d="M15.6,14.1L8.8,0.7c-0.5-1-1.3-1-1.8,0L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2\r
+       C15.6,15.9,16.1,15.1,15.6,14.1z M12.3,11.1l-1.2,0.2c-0.1,0.2-0.2,0.4-0.3,0.7l0.7,1c-0.3,0.4-0.6,0.8-1,1l-1-0.7\r
+       c-0.2,0.1-0.4,0.2-0.6,0.3l-0.2,1.2c-0.2,0-0.5,0.1-0.7,0.1c-0.3,0-0.5,0-0.7-0.1L7,13.6c-0.2-0.1-0.4-0.2-0.6-0.3l-1,0.7\r
+       c-0.4-0.3-0.8-0.6-1-1L5,12c-0.1-0.2-0.2-0.4-0.3-0.7l-1.2-0.2c0-0.2-0.1-0.5-0.1-0.7c0-0.3,0-0.5,0.1-0.7l1.2-0.2\r
+       C4.8,9.2,4.8,9,5,8.8l-0.7-1c0.3-0.4,0.6-0.8,1-1l1,0.7C6.5,7.3,6.7,7.2,7,7.2L7.2,6c0.2,0,0.5-0.1,0.7-0.1c0.3,0,0.5,0,0.7,0.1\r
+       l0.2,1.2c0.2,0.1,0.4,0.2,0.6,0.3l1-0.7c0.4,0.3,0.8,0.6,1,1l-0.7,1C11,9,11.1,9.2,11.1,9.4l1.2,0.2c0,0.2,0.1,0.5,0.1,0.7\r
+       C12.4,10.6,12.4,10.9,12.3,11.1z M9,10.4c0,0.6-0.5,1.1-1.1,1.1S6.8,11,6.8,10.4c0-0.6,0.5-1.1,1.1-1.1S9,9.8,9,10.4z"/>\r
+</svg>\r
diff --git a/pix/i/risk_dataloss.png b/pix/i/risk_dataloss.png
new file mode 100644 (file)
index 0000000..11ce695
Binary files /dev/null and b/pix/i/risk_dataloss.png differ
diff --git a/pix/i/risk_dataloss.svg b/pix/i/risk_dataloss.svg
new file mode 100644 (file)
index 0000000..bb90b92
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.2 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.2 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#CC6AFF;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z\r
+        M11.9,9.4h-0.5l-1,5.5h-5l-1-5.5H3.9l0-1h0.3l0-0.1c0,0,0.8-0.7,2.5-1V6.9c0-0.5,0.5-1,1-1h0.5c0.5,0,1,0.5,1,1v0.4\r
+       c1.7,0.3,2.5,1,2.5,1l0,0.1h0.3V9.4z M7.4,9.4v4.5h-1V9.4H7.4z M8.4,9.4h1v4.5h-1V9.4z M7.9,7.1c-0.2,0-0.3,0-0.5,0c0,0,0-0.1,0-0.1\r
+       c0-0.3,0.2-0.5,0.5-0.5c0.3,0,0.5,0.2,0.5,0.5c0,0,0,0.1,0,0.1C8.3,7.1,8.1,7.1,7.9,7.1z"/>\r
+</svg>\r
diff --git a/pix/i/risk_managetrust.png b/pix/i/risk_managetrust.png
new file mode 100644 (file)
index 0000000..4f3203d
Binary files /dev/null and b/pix/i/risk_managetrust.png differ
diff --git a/pix/i/risk_managetrust.svg b/pix/i/risk_managetrust.svg
new file mode 100644 (file)
index 0000000..2691efa
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M15.6,14.1l-2.5-4.9c-0.5-1-1.3-2.6-1.8-3.6L8.8,0.7c-0.5-1-1.3-1-1.8,0L4.5,5.6\r
+       C4,6.6,3.2,8.2,2.7,9.2l-2.5,4.9c-0.5,1,0,1.8,1.1,1.8h4.6c1.1,0,2.9,0,4,0h4.6C15.6,15.9,16.1,15.1,15.6,14.1z M7.9,12.9H4.1L6,9.4\r
+       l1.9-3.5l1.9,3.5l1.9,3.5H7.9z"/>\r
+</svg>\r
diff --git a/pix/i/risk_personal.png b/pix/i/risk_personal.png
new file mode 100644 (file)
index 0000000..6d518d9
Binary files /dev/null and b/pix/i/risk_personal.png differ
diff --git a/pix/i/risk_personal.svg b/pix/i/risk_personal.svg
new file mode 100644 (file)
index 0000000..b575538
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#76A1F0;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8l13.2,0c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z\r
+        M10.6,9c0,1.2-0.7,2.1-1.8,2.5L9,11.9l1.1,2.4l-2.2,0l-2.2,0l1.1-2.4L7,11.5C6,11.1,5.2,10.1,5.2,9c0-1.5,1.2-2.7,2.7-2.7\r
+       C9.4,6.3,10.6,7.5,10.6,9z"/>\r
+</svg>\r
diff --git a/pix/i/risk_spam.png b/pix/i/risk_spam.png
new file mode 100644 (file)
index 0000000..46b6bd6
Binary files /dev/null and b/pix/i/risk_spam.png differ
diff --git a/pix/i/risk_spam.svg b/pix/i/risk_spam.svg
new file mode 100644 (file)
index 0000000..4f1acbe
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FFB844;" d="M15.6,14.1L8.8,0.7c-0.5-1-1.3-1-1.8,0L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2\r
+       C15.6,15.9,16.1,15.1,15.6,14.1z M8.3,6.5c0.6-0.6,1.5-0.6,2.1,0s0.6,1.5,0,2.1l-1,1L7.3,7.5L8.3,6.5z M5,13.9H2.9v-2.1l3.6-3.6\r
+       l2.1,2.1L5,13.9z M11.9,13.9h-5v-1h5V13.9z"/>\r
+</svg>\r
diff --git a/pix/i/risk_xss.png b/pix/i/risk_xss.png
new file mode 100644 (file)
index 0000000..345f999
Binary files /dev/null and b/pix/i/risk_xss.png differ
diff --git a/pix/i/risk_xss.svg b/pix/i/risk_xss.svg
new file mode 100644 (file)
index 0000000..9bc8352
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FF403C;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8l13.2,0c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z\r
+        M9.4,13.4c0,0.8-0.7,1.5-1.5,1.5c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.7-1.5,1.5-1.5C8.7,11.9,9.4,12.5,9.4,13.4z M9.2,5.9v4\r
+       c0,0.5-0.5,1-1,1l-0.6,0c-0.5,0-1-0.5-1-1v-4c0-0.6,0.5-1,1-1l0.6,0C8.8,4.9,9.2,5.3,9.2,5.9z"/>\r
+</svg>\r
diff --git a/pix/i/roles.png b/pix/i/roles.png
new file mode 100644 (file)
index 0000000..f803c86
Binary files /dev/null and b/pix/i/roles.png differ
diff --git a/pix/i/roles.svg b/pix/i/roles.svg
new file mode 100644 (file)
index 0000000..9fc0081
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M5.2,10.3L0,13.1V16h16v-3l-5.2-2.7C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0\r
+       S4,2.3,4,5.2C4,7.2,5.4,9,5.4,9C5.8,9.5,5.7,10,5.2,10.3z"/>\r
+</svg>\r
diff --git a/pix/i/search.png b/pix/i/search.png
new file mode 100644 (file)
index 0000000..fc2aa28
Binary files /dev/null and b/pix/i/search.png differ
diff --git a/pix/i/search.svg b/pix/i/search.svg
new file mode 100644 (file)
index 0000000..3271954
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M15.5,13.4l-2.1-2.1c-0.2-0.2-0.4-0.3-0.7-0.4C13.5,9.8,14,8.5,14,7c0-3.9-3.1-7-7-7C3.1,0,0,3.1,0,7\r
+       s3.1,7,7,7c1.5,0,2.8-0.5,4-1.2c0.1,0.3,0.2,0.5,0.4,0.7l2.1,2.1c0.6,0.6,1.5,0.6,2.1,0S16.1,14,15.5,13.4z M7,11c-2.2,0-4-1.8-4-4\r
+       s1.8-4,4-4c2.2,0,4,1.8,4,4S9.2,11,7,11z"/>\r
+</svg>\r
index 77011db..f803c86 100644 (file)
Binary files a/pix/i/switchrole.png and b/pix/i/switchrole.png differ
index 8e383de..9fc0081 100644 (file)
@@ -9,7 +9,6 @@
         xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
-<path style="fill:#999999;" d="M10.8,10.3C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0S4,2.3,4,5.2\r
-       C4,7.2,5.4,9,5.4,9c0.3,0.4,0.2,1-0.3,1.3L0,13.1V16h6.6L7,14.2l0.5-1.8l-0.6-0.6L7.7,11h0.6l0.8,0.8l-0.6,0.6L9,14.2L9.5,16H16v-3\r
-       L10.8,10.3z"/>\r
+<path style="fill:#999999;" d="M5.2,10.3L0,13.1V16h16v-3l-5.2-2.7C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0\r
+       S4,2.3,4,5.2C4,7.2,5.4,9,5.4,9C5.8,9.5,5.7,10,5.2,10.3z"/>\r
 </svg>\r
diff --git a/pix/i/tick_amber_big.png b/pix/i/tick_amber_big.png
new file mode 100644 (file)
index 0000000..1733b8a
Binary files /dev/null and b/pix/i/tick_amber_big.png differ
diff --git a/pix/i/tick_amber_big.svg b/pix/i/tick_amber_big.svg
new file mode 100644 (file)
index 0000000..3b7678d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        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;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FFB844;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
+       c0.9-2.7,3.2-8.1,7.1-14.2C11.2,3.7,8.1,8.2,6.4,11.1z"/>\r
+</svg>\r
diff --git a/pix/i/tick_amber_small.png b/pix/i/tick_amber_small.png
new file mode 100644 (file)
index 0000000..1733b8a
Binary files /dev/null and b/pix/i/tick_amber_small.png differ
diff --git a/pix/i/tick_amber_small.svg b/pix/i/tick_amber_small.svg
new file mode 100644 (file)
index 0000000..3b7678d
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        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;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FFB844;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
+       c0.9-2.7,3.2-8.1,7.1-14.2C11.2,3.7,8.1,8.2,6.4,11.1z"/>\r
+</svg>\r
diff --git a/pix/i/tick_green_big.png b/pix/i/tick_green_big.png
new file mode 100644 (file)
index 0000000..11ef29b
Binary files /dev/null and b/pix/i/tick_green_big.png differ
diff --git a/pix/i/tick_green_big.svg b/pix/i/tick_green_big.svg
new file mode 100644 (file)
index 0000000..aef9ff6
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        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;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#99CC33;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
+       c0.9-2.7,3.2-8.1,7.1-14.2C11.2,3.7,8.1,8.2,6.4,11.1z"/>\r
+</svg>\r
diff --git a/pix/i/tick_green_small.png b/pix/i/tick_green_small.png
new file mode 100644 (file)
index 0000000..11ef29b
Binary files /dev/null and b/pix/i/tick_green_small.png differ
diff --git a/pix/i/tick_green_small.svg b/pix/i/tick_green_small.svg
new file mode 100644 (file)
index 0000000..aef9ff6
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        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;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#99CC33;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
+       c0.9-2.7,3.2-8.1,7.1-14.2C11.2,3.7,8.1,8.2,6.4,11.1z"/>\r
+</svg>\r
diff --git a/pix/t/addgreen.png b/pix/t/addgreen.png
new file mode 100644 (file)
index 0000000..fd8cbbe
Binary files /dev/null and b/pix/t/addgreen.png differ
diff --git a/pix/t/addgreen.svg b/pix/t/addgreen.svg
new file mode 100644 (file)
index 0000000..9197663
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M11,4.5H7.5V1c0-0.5-0.5-1-1-1h-1c-0.5,0-1,0.5-1,1v3.5L1,4.5c-0.5,0-1,0.5-1,1v1c0,0.5,0.5,1,1,1\r
+       h3.5V11c0,0.5,0.5,1,1,1h1c0.5,0,1-0.5,1-1V7.5H11c0.6,0,1-0.5,1-1l0-1C12,5,11.6,4.5,11,4.5z"/>\r
+</svg>\r
diff --git a/pix/t/clear.png b/pix/t/clear.png
new file mode 100644 (file)
index 0000000..43540a5
Binary files /dev/null and b/pix/t/clear.png differ
diff --git a/pix/t/clear.svg b/pix/t/clear.svg
new file mode 100644 (file)
index 0000000..b29d965
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M11.4,0.6l-0.9-0.5C10.1-0.1,9.5,0,9.2,0.5L4.7,8.2L2,6.6C1.5,6.3,0.9,6.5,0.6,7L0.1,7.8\r
+       C-0.1,8.3,0,8.9,0.5,9.2L5,11.8c0.1,0.1,0.3,0.1,0.4,0.1c0.4,0.1,0.8-0.1,1-0.5L11.8,2C12.1,1.5,11.9,0.9,11.4,0.6z"/>\r
+</svg>\r
diff --git a/pix/t/manual_item.png b/pix/t/manual_item.png
new file mode 100644 (file)
index 0000000..830c426
Binary files /dev/null and b/pix/t/manual_item.png differ
diff --git a/pix/t/manual_item.svg b/pix/t/manual_item.svg
new file mode 100644 (file)
index 0000000..ecbbb58
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M15,5.2V15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V2c0-0.5,0.5-1,1-1h9.8l-2,2H3C2.5,3,2,3.4,2,4v9\r
+       c0,0.5,0.5,1,1,1h9c0.5,0,1-0.5,1-1V7.2L15,5.2z M15.4,0.6L15.4,0.6c-0.8-0.8-2.1-0.8-2.8,0l-1,1l2.8,2.8l1-1\r
+       C16.2,2.6,16.2,1.4,15.4,0.6z M10.6,2.6L4,9.1V12h2.8c0,0,1.8-1.8,1.8-1.8l4.8-4.8L10.6,2.6z"/>\r
+</svg>\r
diff --git a/pix/t/unlock_gray.png b/pix/t/unlock_gray.png
new file mode 100644 (file)
index 0000000..04b8c5b
Binary files /dev/null and b/pix/t/unlock_gray.png differ
diff --git a/pix/t/unlock_gray.svg b/pix/t/unlock_gray.svg
new file mode 100644 (file)
index 0000000..72eb809
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M6.5,0l-1,0c-1.7,0-3,1.3-3,3v2H1C0.5,5,0,5.5,0,6l0,5c0,0.6,0.4,1,1,1h10c0.5,0,1-0.5,1-1l0-5\r
+       c0-0.6-0.5-1-1-1H9.5l0-2C9.5,1.3,8.2,0,6.5,0z M7,8c0,0.4-0.2,0.7-0.6,0.9L6.5,9L7,10H6H5l0.5-1l0.1-0.1C5.2,8.7,5,8.4,5,8\r
+       c0-0.5,0.4-1,1-1S7,7.5,7,8z M7.5,3v2l-3,0V3c0-0.6,0.5-1,1-1h1C7.1,2,7.5,2.4,7.5,3z"/>\r
+</svg>\r
diff --git a/pix/t/user.png b/pix/t/user.png
new file mode 100644 (file)
index 0000000..e7ca8cc
Binary files /dev/null and b/pix/t/user.png differ
diff --git a/pix/t/user.svg b/pix/t/user.svg
new file mode 100644 (file)
index 0000000..a1220af
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M3.7,7.6L0.1,9.4c0,0-0.1,0-0.1,0.1V12h12V9.3c0,0-0.1-0.1-0.1-0.1L8.3,7.5C7.8,7.3,7.7,6.7,8,6.3\r
+       c0,0,0.9-1.1,0.9-2.5C8.9,1.7,7.6,0,6,0C4.4,0,3.1,1.7,3.1,3.8C3.1,5.2,4,6.3,4,6.3C4.3,6.7,4.2,7.3,3.7,7.6z"/>\r
+</svg>\r
diff --git a/pix/t/userblue.png b/pix/t/userblue.png
new file mode 100644 (file)
index 0000000..e7ca8cc
Binary files /dev/null and b/pix/t/userblue.png differ
diff --git a/pix/t/userblue.svg b/pix/t/userblue.svg
new file mode 100644 (file)
index 0000000..a1220af
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M3.7,7.6L0.1,9.4c0,0-0.1,0-0.1,0.1V12h12V9.3c0,0-0.1-0.1-0.1-0.1L8.3,7.5C7.8,7.3,7.7,6.7,8,6.3\r
+       c0,0,0.9-1.1,0.9-2.5C8.9,1.7,7.6,0,6,0C4.4,0,3.1,1.7,3.1,3.8C3.1,5.2,4,6.3,4,6.3C4.3,6.7,4.2,7.3,3.7,7.6z"/>\r
+</svg>\r
index b1827bb..5774931 100644 (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
index 6642157..0c2ddb2 100644 (file)
@@ -89,11 +89,10 @@ $(document).ready(function() {
 
 
     //course page only js
-    $('div.path-course-view, .path-course-view div.generalpage').live('pagebeforecreate', function(event, ui) {
+    $('div.path-site, div.path-course-view, .path-course-view div.generalpage').live('pagebeforecreate', function(event, ui) {
         //course listing
-        $('.section li img').addClass("ui-li-icon");
-        $('.course-content ul.section').attr("data-role", "listview").attr("data-inset", "true").attr("data-theme", mythemeb);
-        $('.sitetopic ul.section').attr("data-role", "listview").attr("data-inset", "true").attr("data-theme", mythemeb);
+        $('.section li img.activityicon').addClass("ui-li-icon");
+        $('.course-content ul.section, .sitetopic ul.section').attr("data-role", "listview").attr("data-inset", "true").attr("data-theme", mythemeb);
         $('.topics div.left.side').addClass("ui-bar-" + mytheme);
         $('.section.hidden div.headingwrap').attr("data-theme", mythemeb);
         //$('.topics #section-0 div.left.side').removeClass("ui-li ui-li-divider ui-btn ui-bar-a");
@@ -108,6 +107,12 @@ $(document).ready(function() {
             this.form.submit();
             return false;
         });
+
+        // Force the class ui-li-desc on non-detected elements.
+        $('ul.section div.availabilityinfo, ul.section div.contentafterlink').addClass('ui-li-desc');
+
+        // Force some classes on dimmed elements.
+        $('ul.section div.dimmed_text > span').addClass('instancename');
     });
 
     //forum listing only stuff
index 058936c..891f6a9 100644 (file)
@@ -5048,7 +5048,15 @@ $.widget( "mobile.listview", $.mobile.widget, {
                        // If we're creating the element, we update it regardless
                        if ( create || !item.hasClass( "ui-li" ) ) {
                                itemTheme = item.jqmData("theme") || o.theme;
-                               a = this._getChildrenByTagName( item[ 0 ], "a", "A" );
+
+                               // Moodle Hack to nicely display the activities on the course page.
+                               // Activities <a> is not a children, we need to find it.
+                               if (item.hasClass( "activity" ) && (!item.hasClass( "label" ))) {
+                                       a = item.find( "a" );
+                               } else {
+                                       a = this._getChildrenByTagName( item[ 0 ], "a", "A" );
+                               }
+
                                var isDivider = ( item.jqmData( "role" ) === "list-divider" );
 
                                if ( a.length && !isDivider ) {
diff --git a/theme/mymobile/readme_moodle.txt b/theme/mymobile/readme_moodle.txt
new file mode 100644 (file)
index 0000000..99d4fcf
--- /dev/null
@@ -0,0 +1,16 @@
+MyMobile Theme
+==============
+
+jQuery Mobile listview hack
+---------------------------
+
+The jQuery Mobile library (jquery.mobile-[...].js) includes a custom hack to
+allow lisview elements to have a their <a> not as direct child of <li>. This
+is used for activities which encapsulate the <a> in several divs.
+
+Run the following command to view the hack:
+    git show 3b84abce6ab7ff3862cd92c7d74ce0e8578004b3
+
+Remember to place this hack in the library when you update it. Also, we often
+forget that activities can be listed on the front page too, please test the
+theme in both a course and the front page.
index ef45f30..b333b1d 100644 (file)
@@ -301,9 +301,28 @@ li a.dimmed span {
     padding-left: 10px;
 }
 */
-.course-content li.activity.ui-btn .ui-btn-text a {
-    padding-left: 35px;
+.sitetopic li.activity.ui-li-static div.activityinstance,
+.course-content li.activity.ui-li-static div.activityinstance,
+.sitetopic li.activity.ui-btn .ui-btn-text a,
+.course-content li.activity.ui-btn .ui-btn-text a,
+.sitetopic .section .activity .availabilityinfo,
+.sitetopic .section .activity .contentafterlink,
+.course-content .section .activity .availabilityinfo,
+.course-content .section .activity .contentafterlink {
+    padding-left: 45px;
     padding-right: 60px;
+    margin-left: 0;
+    margin-right: 0;
+    position: relative;
+}
+.sitetopic .section li.activity p.ui-li-desc a.autolink,
+.course-content .section li.activity p.ui-li-desc a.autolink {
+    padding: 0;
+    margin: 0;
+}
+.path-site li.activity.label > div,
+.path-course-view li.activity.label > div {
+    position: static;
 }
 .topics #section-0 div.left.side {
     display: none;
@@ -316,13 +335,9 @@ li a.dimmed span {
 .topics li.activity span.accesshide, .weeks li.activity span.accesshide, .ui-navbar span.accesshide {
     display: none;
 }
-.topics li.activity span.autocompletion, .weeks li.activity span.autocompletion {
-    display: block;
-    right: 70px;
-    top: -5px;
-}
+.sitetopic .section .activity img.activityicon,
 .course-content .section .activity img.activityicon {
-    margin-top: -.2em;
+    margin-top: -.5em;
 }
 li.activity.ui-li-static span, li.activity div.availabilityinfo {
     white-space: normal;
@@ -344,19 +359,21 @@ form.togglecompletion div {
 form.togglecompletion input {
     visibility: hidden;
 }
-.togglecompletion input[type="image"] {
+
+.path-course-view li.activity span.autocompletion {
+    position: static;
+}
+.path-course-view li.activity span.autocompletion img,
+.path-course-view li.activity form.togglecompletion [type="image"] {
     display: block !important;
     position: absolute !important;
     top: 21%;
-    right: 2em !important;
+    right: 4em !important;
     left:auto !important;
     visibility: visible;
     width: 26px;
     height: 23px;
 }
-li.activity.ui-li-static span, li.activity div.availabilityinfo{
-    margin-left: 1.3em;
-}
 .topics .content, .weeks .content {
     padding-left: 0px !important;
     padding-right: 0px !important;
@@ -410,6 +427,11 @@ li.activity.label {
     padding: .6em !important;
     cursor:default;
 }
+li.activity.label form.togglecompletion { position: relative; }
+.sitetopic .section .activity .activityinstance,
+.course-content .section .activity .activityinstance,
+.sitetopic .section .activity .activityinstance div,
+.course-content .section .activity .activityinstance div { display: block; }
 li.label .no-overflow ul, li.label .no-overflow ul li {
     list-style-position: inside;
 }
index 0e74a17..1d15639 100644 (file)
@@ -38,6 +38,15 @@ if ($slashargument = min_get_slash_argument()) {
     if (substr_count($slashargument, '/') < 2) {
         image_not_found();
     }
+
+    if (strpos($slashargument, '_s/') === 0) {
+        // Can't use SVG
+        $slashargument = substr($slashargument, 3);
+        $usesvg = false;
+    } else {
+        $usesvg = true;
+    }
+
     // image must be last because it may contain "/"
     list($themename, $rev, $type) = explode('/', $slashargument, 3);
     $themename = min_clean_param($themename, 'SAFEDIR');
@@ -48,6 +57,7 @@ if ($slashargument = min_get_slash_argument()) {
     $themename = min_optional_param('theme', 'standard', 'SAFEDIR');
     $rev       = min_optional_param('rev', 0, 'INT');
     $type      = min_optional_param('type', 'all', 'SAFEDIR');
+    $usesvg    = (bool)min_optional_param('svg', '1', 'INT');
 }
 
 if (!in_array($type, array('all', 'ie', 'editor', 'plugins', 'parents', 'theme'))) {
@@ -68,8 +78,15 @@ if ($type === 'ie') {
     css_send_ie_css($themename, $rev, $etag, !empty($slashargument));
 }
 
-$candidatesheet = "$CFG->cachedir/theme/$themename/css/$type.css";
-$etag = sha1("$themename/$rev/$type");
+$candidatedir = "$CFG->cachedir/theme/$themename/css";
+$etag = "$themename/$rev/$type";
+if (!$usesvg) {
+    // Add to the sheet name, one day we'll be able to just drop this.
+    $candidatedir .= '/nosvg';
+    $etag .= '/nosvg';
+}
+$candidatesheet = "$candidatedir/$type.css";
+$etag = sha1($etag);
 
 if (file_exists($candidatesheet)) {
     if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) || !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
@@ -90,14 +107,25 @@ define('NO_UPGRADE_CHECK', true);  // Ignore upgrade check
 require("$CFG->dirroot/lib/setup.php");
 
 $theme = theme_config::load($themename);
+$theme->force_svg_use($usesvg);
 
 $rev = theme_get_revision();
-$etag = sha1("$themename/$rev/$type");
+
+$etag = "$themename/$rev/$type";
+if (!$usesvg) {
+    // Add to the etag, one day we'll be able to just delete svg nonsense this.
+    $etag .= '/nosvg';
+}
+$etag = sha1($etag);
 
 if ($type === 'editor') {
     $cssfiles = $theme->editor_css_files();
     css_store_css($theme, $candidatesheet, $cssfiles);
 } else {
+    $basedir = "$CFG->cachedir/theme/$themename/css";
+    if (!$usesvg) {
+        $basedir .= '/nosvg';
+    }
     $css = $theme->css_files();
     $allfiles = array();
     foreach ($css as $key=>$value) {
@@ -111,11 +139,11 @@ if ($type === 'editor') {
                 $cssfiles[] = $val;
             }
         }
-        $cssfile = "$CFG->cachedir/theme/$themename/css/$key.css";
+        $cssfile = "$basedir/$key.css";
         css_store_css($theme, $cssfile, $cssfiles);
         $allfiles = array_merge($allfiles, $cssfiles);
     }
-    $cssfile = "$CFG->cachedir/theme/$themename/css/all.css";
+    $cssfile = "$basedir/all.css";
     css_store_css($theme, $cssfile, $allfiles);
 }
 
index ea47305..140fefd 100644 (file)
@@ -32,6 +32,7 @@ $themename = min_optional_param('theme', 'standard', 'SAFEDIR');
 $type      = min_optional_param('type', '', 'SAFEDIR');
 $subtype   = min_optional_param('subtype', '', 'SAFEDIR');
 $sheet     = min_optional_param('sheet', '', 'SAFEDIR');
+$usesvg    = (bool)min_optional_param('svg', '1', 'INT');
 
 if (!defined('THEME_DESIGNER_CACHE_LIFETIME')) {
     define('THEME_DESIGNER_CACHE_LIFETIME', 4); // this can be also set in config.php
@@ -47,9 +48,15 @@ if (file_exists("$CFG->dirroot/theme/$themename/config.php")) {
 
 // no gzip compression when debugging
 
-$candidatesheet = "$CFG->cachedir/theme/$themename/designer.ser";
+if ($usesvg) {
+    $candidatesheet = "$CFG->cachedir/theme/$themename/designer.ser";
+} else {
+    // Add to the sheet name, one day we'll be able to just drop this.
+    $candidatesheet = "$CFG->cachedir/theme/$themename/designer_nosvg.ser";
+}
 
 if (!file_exists($candidatesheet)) {
+
     css_send_css_not_found();
 }