commit 7c47777e85439463e755432d935fc6f83223dbcf parent fd00424d19d2055ff040c870262ee7ca7a1b305e Author: Jan Dankert <develop@jandankert.de> Date: Sat, 17 Oct 2020 02:19:44 +0200 Fix: Include of resources was broken since the last components refactoring. Diffstat:
22 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/file/info.php b/modules/cms/ui/themes/default/html/views/file/info.php @@ -124,7 +124,7 @@ </span> <br /><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($cache_filemtime); ?> <?php } ?> </div> </div> @@ -182,12 +182,12 @@ <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($create_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($create_user); ?> <?php } ?> </div> </div> @@ -199,12 +199,12 @@ <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> <?php } ?> </div> </div> @@ -218,12 +218,12 @@ <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($published_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($published_user); ?> <?php } ?> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/content.php b/modules/cms/ui/themes/default/html/views/folder/content.php @@ -42,7 +42,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.php b/modules/cms/ui/themes/default/html/views/folder/edit.php @@ -50,7 +50,7 @@ </a> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/folder/order.php b/modules/cms/ui/themes/default/html/views/folder/order.php @@ -56,7 +56,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/folder/show.php b/modules/cms/ui/themes/default/html/views/folder/show.php @@ -45,7 +45,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/login/license.php b/modules/cms/ui/themes/default/html/views/login/license.php @@ -35,7 +35,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($user_login); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($user_login); ?> <?php } ?> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/object/info.php b/modules/cms/ui/themes/default/html/views/object/info.php @@ -129,7 +129,7 @@ </span> <br /><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($cache_filemtime); ?> <?php } ?> </div> </div> @@ -203,7 +203,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($valid_from_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($valid_from_date); ?> <?php } ?> </div> </div> @@ -213,7 +213,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($valid_to_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($valid_to_date); ?> <?php } ?> </div> </div> @@ -238,12 +238,12 @@ <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($create_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($create_user); ?> <?php } ?> </div> </div> @@ -255,12 +255,12 @@ <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> <?php } ?> </div> </div> @@ -274,12 +274,12 @@ <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($published_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($published_user); ?> <?php } ?> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/info.php b/modules/cms/ui/themes/default/html/views/page/info.php @@ -194,11 +194,11 @@ </div> <div class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($create_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/user.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($create_user); ?> <?php } ?> </div> </div> @@ -211,11 +211,11 @@ </div> <div class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/user.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> <?php } ?> </div> </div> @@ -228,11 +228,11 @@ </div> <div class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($published_date); ?> <?php } ?> <br /><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/user.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($published_user); ?> <?php } ?> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/advanced.php b/modules/cms/ui/themes/default/html/views/pageelement/advanced.php @@ -28,7 +28,7 @@ <td title="<?php echo O::escapeHtml(''.@$text.'') ?>" class="<?php echo O::escapeHtml('or-clickable') ?>"><?php echo O::escapeHtml('') ?> <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('pageelement') ?>" data-method="<?php echo O::escapeHtml('value') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-languageid="<?php echo O::escapeHtml(''.@$languageid.'') ?>" data-extra="<?php echo O::escapeHtml('{\'languageid\':\''.@$languageid.'\'}') ?>" href="<?php echo O::escapeHtml('/#/pageelement/') ?>"><?php echo O::escapeHtml('') ?> <?php $if1=($date); if($if1) { ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> <?php } ?> <?php } ?> <?php $if1=($text); if($if1) { ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/diff.php b/modules/cms/ui/themes/default/html/views/pageelement/diff.php @@ -13,7 +13,7 @@ </em> <span><?php echo O::escapeHtml(' ') ?> </span> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date_left); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date_left); ?> <?php } ?> </td> <td><?php echo O::escapeHtml('') ?> @@ -23,7 +23,7 @@ </em> <span><?php echo O::escapeHtml(' ') ?> </span> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date_right); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date_right); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.php b/modules/cms/ui/themes/default/html/views/pageelement/history.php @@ -82,7 +82,7 @@ <?php } ?> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> <?php } ?> </td> <td><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/info.php b/modules/cms/ui/themes/default/html/views/pageelement/info.php @@ -95,13 +95,13 @@ <td><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> <span><?php echo O::escapeHtml(', ') ?> </span> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> </i> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/prop.php b/modules/cms/ui/themes/default/html/views/pageelement/prop.php @@ -131,12 +131,12 @@ <tr><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> <td><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/user.png') ?>" /><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/profile/edit.php b/modules/cms/ui/themes/default/html/views/profile/edit.php @@ -160,7 +160,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($passwordExpires); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($passwordExpires); ?> <?php } ?> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/profile/history.php b/modules/cms/ui/themes/default/html/views/profile/history.php @@ -34,7 +34,7 @@ </a> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/project/history.php b/modules/cms/ui/themes/default/html/views/project/history.php @@ -60,7 +60,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/history.php b/modules/cms/ui/themes/default/html/views/projectlist/history.php @@ -40,7 +40,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/search/result.php b/modules/cms/ui/themes/default/html/views/search/result.php @@ -25,7 +25,7 @@ </a> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/start/userprojecttimeline.php b/modules/cms/ui/themes/default/html/views/start/userprojecttimeline.php @@ -48,7 +48,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/user/history.php b/modules/cms/ui/themes/default/html/views/user/history.php @@ -34,7 +34,7 @@ </a> </td> <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/user/info.php b/modules/cms/ui/themes/default/html/views/user/info.php @@ -172,7 +172,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($passwordExpires); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($passwordExpires); ?> <?php } ?> </div> </div> @@ -192,7 +192,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastLogin); ?> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastLogin); ?> <?php } ?> </div> </div> diff --git a/modules/template_engine/element/PHPBlockElement.class.php b/modules/template_engine/element/PHPBlockElement.class.php @@ -74,7 +74,7 @@ class PHPBlockElement extends HtmlElement public function includeResource($file ) { - return "include_once( 'modules/template_engine/components/html/".$file."');"; + return "include_once( 'modules/template_engine/components/html/component_".$file."');"; } } \ No newline at end of file