commit b92c382a6fad268d3359799269dcb8b71a64fb46 parent 979a2880126b01eac037b060c0734d44deb87358 Author: Jan Dankert <develop@jandankert.de> Date: Thu, 17 Oct 2019 21:29:58 +0200 Fix: Show correct icon for elements. Diffstat:
9 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/modules/cms-ui/themes/default/html/views/element/info.php b/modules/cms-ui/themes/default/html/views/element/info.php @@ -7,7 +7,7 @@ </td> <td> - <i class="image-icon image-icon--element-<?php echo $type ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> <span><?php echo nl2br(encodeHtml(htmlentities(lang('el_'.$type.'')))); ?></span> diff --git a/modules/cms-ui/themes/default/html/views/folder/info.php b/modules/cms-ui/themes/default/html/views/folder/info.php @@ -62,7 +62,7 @@ </label> </div> <div class="input"> - <i class="image-icon image-icon--element-date"></i> + <i class="image-icon image-icon--action-el_date"></i> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($create_date) ?> @@ -80,7 +80,7 @@ </label> </div> <div class="input"> - <i class="image-icon image-icon--element-date"></i> + <i class="image-icon image-icon--action-el_date"></i> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> diff --git a/modules/cms-ui/themes/default/html/views/page/edit.php b/modules/cms-ui/themes/default/html/views/page/edit.php @@ -38,7 +38,7 @@ </td> <td> - <i class="image-icon image-icon--element-<?php echo $typename ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $typename ?>"></i> <span><?php echo nl2br(encodeHtml(htmlentities(lang('el_'.$typename.'')))); ?></span> diff --git a/modules/cms-ui/themes/default/html/views/page/form.php b/modules/cms-ui/themes/default/html/views/page/form.php @@ -31,7 +31,7 @@ <tr class="data"> <td> <label for="<?php echo REQUEST_ID ?>_<?php echo $saveid ?>" class="label"> - <i class="image-icon image-icon--element-<?php echo $type ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.php b/modules/cms-ui/themes/default/html/views/pageelement/info.php @@ -27,7 +27,7 @@ </td> <td class="filename"> - <i class="image-icon image-icon--element-<?php echo $element_type ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> @@ -38,11 +38,13 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'template'.'')))); ?></span> </td> - <td data-name="<?php echo $template_name ?>" data-action="template" data-id="<?php echo $template_id ?>" class="clickable"> - <img src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> - - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> - + <td class="clickable"> + <a target="_self" data-type="open" data-action="template" data-method="info" data-id="<?php echo $template_id ?>" data-extra="[]" href="./#/template/<?php echo $template_id ?>"> + <i class="image-icon image-icon--action-template"></i> + + <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + + </a> </td> </tr> <tr class="data"> @@ -50,11 +52,13 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span> </td> - <td data-name="<?php echo $element_name ?>" data-action="element" data-id="<?php echo $element_id ?>" class="clickable"> - <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $element_type ?>.png" /> - - <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> - + <td class="clickable"> + <a target="_self" date-name="<?php echo $element_name ?>" name="<?php echo $element_name ?>" data-action="element" data-method="info" data-id="<?php echo $element_id ?>" data-extra="[]" href="./#/element/<?php echo $element_id ?>"> + <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> + + <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> + + </a> </td> </tr> <tr class="data"> @@ -85,13 +89,13 @@ </td> <td> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + <i class="image-icon image-icon--action-el_date"></i> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> <span><?php echo nl2br(', '); ?></span> - <img src="./modules/cms-ui/themes/default/images/icon/user.png" /> + <i class="image-icon image-icon--action-user"></i> <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/info.tpl.src.xml @@ -30,18 +30,22 @@ <column> <text key="template"></text> </column> - <column id="var:template_id" name="var:template_name" action="template"> - <image file="icon_template"></image> - <text var="template_name"></text> + <column class="clickable"> + <link type="open" action="template" id="var:template_id"> + <image action="template"></image> + <text var="template_name"></text> + </link> </column> </row> <row class="data"> <column> <text key="element"></text> </column> - <column id="var:element_id" name="var:element_name" action="element"> - <image type="var:element_type"></image> - <text var="element_name"></text> + <column class="clickable"> + <link id="var:element_id" name="var:element_name" action="element"> + <image elementtype="var:element_type"></image> + <text var="element_name"></text> + </link> </column> </row> <row class="data"> @@ -66,10 +70,10 @@ <text text="lastchange"></text> </column> <column> - <image icon="el_date"></image> + <image elementtype="date"></image> <date date="var:lastchange_date"></date> <text raw=", "></text> - <image icon="user"></image> + <image action="user"></image> <user user="var:lastchange_user"></user> </column> </row> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/prop.php b/modules/cms-ui/themes/default/html/views/pageelement/prop.php @@ -28,7 +28,7 @@ </td> <td class="filename"> - <i class="image-icon image-icon--element-<?php echo $element_type ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> @@ -70,7 +70,7 @@ <td> <?php $if6=(isset($element_url)); if($if6){?> <a target="_self" data-url="<?php echo $element_url ?>" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <i class="image-icon image-icon--element-<?php echo $element_type ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> diff --git a/modules/cms-ui/themes/default/html/views/template/edit.php b/modules/cms-ui/themes/default/html/views/template/edit.php @@ -17,7 +17,7 @@ <tr class="data"> <td class="clickable"> <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="element" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="./#/element/<?php echo $id ?>"> - <i class="image-icon image-icon--element-<?php echo $type ?>"></i> + <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> <span title="<?php echo $description ?>"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> diff --git a/modules/template-engine/components/html/image/Image.class.php b/modules/template-engine/components/html/image/Image.class.php @@ -36,7 +36,7 @@ class ImageComponent extends Component elseif ( !empty($this->elementtype) ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--element-'.$this->htmlvalue($this->elementtype); + $styleClass = 'image-icon image-icon--action-el_'.$this->htmlvalue($this->elementtype); $selfClosing = false; } elseif ( !empty($this->action) )