commit 046c10fd4ef7eac976b33a3c80e9227e8ca7e085 parent 1ef8e7bad7a137364a597144bfe15ac4cefb37e5 Author: Jan Dankert <devnull@localhost> Date: Wed, 5 Dec 2018 00:08:06 +0100 Fix: Richtige Icons verwenden. Diffstat:
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -29,7 +29,7 @@ <column class="clickable"> <label for="var:id"> <link type="open" name="var:name" action="var:type" id="var:objectid"> - <image type="var:icon"></image> + <image action="var:icon"></image> <text var="name" maxlength="40"></text> <text raw="_"></text> </link> diff --git a/modules/cms-ui/themes/default/html/views/folder/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/preview.tpl.src.xml @@ -26,7 +26,7 @@ <row class="data"> <column class="clickable"> <link type="open" id="var:id" name="var:name" action="var:type" title="var:desc"> - <image type="var:icon"></image> + <image action="var:icon"></image> <text var="name"></text> <text raw="_"></text> </link> diff --git a/modules/cms-ui/themes/default/html/views/grouplist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/grouplist/show.tpl.src.xml @@ -21,7 +21,7 @@ <row class="data"> <column colspan="2" class="clickable"> <link type="dialog" subaction="add" name="message:menu_add"> - <image icon="add"/> + <image method="add"/> <text text="new"/> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/projectlist/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/projectlist/edit.tpl.src.xml @@ -11,7 +11,7 @@ <row class="data"> <column class="clickable"> <link type="open" id="var:id" name="var:name" action="project"> - <image file="icon_project"></image> + <image action="project"></image> <text value="var:name" maxlength="30"></text> </link> </column> @@ -20,7 +20,7 @@ <row class="data"> <column class="clickable"> <link type="dialog" subaction="add" name="message:new"> - <image icon="add" /> + <image method="add" /> <text text="new" /> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/userlist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/userlist/show.tpl.src.xml @@ -41,7 +41,7 @@ <row class="data"> <column colspan="3" class="clickable"> <link type="dialog" subaction="add" name="message:add"> - <image icon="add"/> + <image method="add"/> <text text="new"/> </link> </column> diff --git a/modules/template-engine/components/html/image/Image.class.php b/modules/template-engine/components/html/image/Image.class.php @@ -30,25 +30,25 @@ class ImageComponent extends Component if ( !empty($this->menu) ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--menu-'.$this->menu; + $styleClass = 'image-icon image-icon--menu-'.$this->htmlvalue($this->menu); $selfClosing = false; } elseif ( !empty($this->elementtype) ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--element-'.$this->elementtype; + $styleClass = 'image-icon image-icon--element-'.$this->htmlvalue($this->elementtype); $selfClosing = false; } elseif ( !empty($this->action) ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--action-'.$this->action; + $styleClass = 'image-icon image-icon--action-'.$this->htmlvalue($this->action); $selfClosing = false; } elseif ( !empty($this->method) ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--method-'.$this->method; + $styleClass = 'image-icon image-icon--method-'.$this->htmlvalue($this->method); $selfClosing = false; } elseif ( !empty($this->type) )