openrat-cms

# OpenRat Content Management System
git clone http://git.code.weiherhei.de/openrat-cms.git
Log | Files | Refs

commit 92709b3d4bec48eee356242ab6622932787ef3a7
parent f8367a0e4df32f2036483f1a14cfb05917eda7db
Author: Jan Dankert <develop@jandankert.de>
Date:   Tue, 18 Feb 2020 00:59:51 +0100

Total refactoring: All components are creating elements. Status: Work in progress.

Diffstat:
.gitignore | 4++--
modules/cms-ui/themes/default/html/views/README.md | 19+++++++++++++++++++
modules/cms-ui/themes/default/html/views/configuration/show.php | 22+++++++++++++---------
modules/cms-ui/themes/default/html/views/configuration/show.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/configuration/src.php | 6++++--
modules/cms-ui/themes/default/html/views/element/advanced.php | 324+++++++++++++++++++++++++++++++++++++++----------------------------------------
modules/cms-ui/themes/default/html/views/element/advanced.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/element/info.php | 35+++++++++++++++++++++--------------
modules/cms-ui/themes/default/html/views/element/info.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/element/name.php | 36++++++++++++++++++------------------
modules/cms-ui/themes/default/html/views/element/prop.php | 35+++++++++++++++++++++--------------
modules/cms-ui/themes/default/html/views/element/properties.php | 423++++++++++++++++++++++++++++++++++++++++---------------------------------------
modules/cms-ui/themes/default/html/views/element/remove.php | 61++++++++++++++++++++++++++++++-------------------------------
modules/cms-ui/themes/default/html/views/element/remove.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/file/advanced.php | 13+++++++------
modules/cms-ui/themes/default/html/views/file/compress.php | 40++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/file/compress.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/file/edit.php | 18+++++++++++-------
modules/cms-ui/themes/default/html/views/file/edit.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/file/extract.php | 12++++--------
modules/cms-ui/themes/default/html/views/file/info.php | 181+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml | 22+++++++++++-----------
modules/cms-ui/themes/default/html/views/file/preview.php | 5+++--
modules/cms-ui/themes/default/html/views/file/preview.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/file/pub.php | 26++++++++++++--------------
modules/cms-ui/themes/default/html/views/file/pub.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/file/remove.php | 24+++++++-----------------
modules/cms-ui/themes/default/html/views/file/show.php | 5+++--
modules/cms-ui/themes/default/html/views/file/structure.php | 1-
modules/cms-ui/themes/default/html/views/file/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/file/uncompress.php | 30++++++++++++++++++------------
modules/cms-ui/themes/default/html/views/file/uncompress.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/file/value.php | 24+++++++++++-------------
modules/cms-ui/themes/default/html/views/folder/advanced.php | 156++++++++++++++++++++++++++++++++++----------------------------------------------
modules/cms-ui/themes/default/html/views/folder/advanced.tpl.src.xml | 26+++++++++++++-------------
modules/cms-ui/themes/default/html/views/folder/content.php | 102+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
modules/cms-ui/themes/default/html/views/folder/content.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/folder/create.php | 63+++++++++++++++++++++++++++++++++++----------------------------
modules/cms-ui/themes/default/html/views/folder/create.tpl.src.xml | 14+++++++-------
modules/cms-ui/themes/default/html/views/folder/createfile.php | 43+++++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/folder/createfile.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/folder/createfolder.php | 21+++++++++++++--------
modules/cms-ui/themes/default/html/views/folder/createfolder.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/folder/createimage.php | 43+++++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/folder/createimage.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/folder/createlink.php | 18+++++++++++-------
modules/cms-ui/themes/default/html/views/folder/createpage.php | 25+++++++++++++++----------
modules/cms-ui/themes/default/html/views/folder/createtext.php | 40+++++++++++++++++++++++++---------------
modules/cms-ui/themes/default/html/views/folder/createtext.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/folder/createurl.php | 24+++++++++++++++---------
modules/cms-ui/themes/default/html/views/folder/edit.php | 79++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/folder/inherit.php | 23+++++++++++++----------
modules/cms-ui/themes/default/html/views/folder/inherit.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/folder/order.php | 60++++++++++++++++++++++++++++++++++++------------------------
modules/cms-ui/themes/default/html/views/folder/order.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/folder/pub.php | 123++++++++++++++++++++++++++++---------------------------------------------------
modules/cms-ui/themes/default/html/views/folder/pub.tpl.src.xml | 12++++++------
modules/cms-ui/themes/default/html/views/folder/remove.php | 39+++++++++------------------------------
modules/cms-ui/themes/default/html/views/folder/show.php | 75++++++++++++++++++++++++++++++++++++++++++++-------------------------------
modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/folder/structure.php | 1-
modules/cms-ui/themes/default/html/views/folder/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/group/add.php | 11++++++-----
modules/cms-ui/themes/default/html/views/group/info.php | 40++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/group/info.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/group/memberships.php | 52++++++++++++++++++++--------------------------------
modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/group/prop.php | 14++++++++------
modules/cms-ui/themes/default/html/views/group/remove.php | 30++++++++++--------------------
modules/cms-ui/themes/default/html/views/group/remove.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/group/rights.php | 120+++++++++++++++++++++++++++++++++++++++++--------------------------------------
modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml | 14+++++++-------
modules/cms-ui/themes/default/html/views/grouplist/add.php | 11++++++-----
modules/cms-ui/themes/default/html/views/grouplist/show.php | 29+++++++++++++++++------------
modules/cms-ui/themes/default/html/views/grouplist/show.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/image/compress.php | 40++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/image/compress.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/image/edit.php | 18+++++++++++-------
modules/cms-ui/themes/default/html/views/image/extract.php | 12++++--------
modules/cms-ui/themes/default/html/views/image/preview.php | 5+++--
modules/cms-ui/themes/default/html/views/image/preview.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/image/pub.php | 26++++++++++++--------------
modules/cms-ui/themes/default/html/views/image/pub.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/image/remove.php | 50+++++++++++++++++++-------------------------------
modules/cms-ui/themes/default/html/views/image/show.php | 23++++++++++++++---------
modules/cms-ui/themes/default/html/views/image/show.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/image/size.php | 99+++++++++++++++++++++++++++++++++++++++++--------------------------------------
modules/cms-ui/themes/default/html/views/image/size.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/image/structure.php | 1-
modules/cms-ui/themes/default/html/views/image/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/image/uncompress.php | 30++++++++++++++++++------------
modules/cms-ui/themes/default/html/views/image/uncompress.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/image/value.php | 24+++++++++++-------------
modules/cms-ui/themes/default/html/views/language/add.php | 13+++++++------
modules/cms-ui/themes/default/html/views/language/info.php | 26++++++++++++++++----------
modules/cms-ui/themes/default/html/views/language/listing.php | 77+++++++++++++++++++++++++++++++++++++++++++++--------------------------------
modules/cms-ui/themes/default/html/views/language/listing.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/language/prop.php | 35++++++++++++++---------------------
modules/cms-ui/themes/default/html/views/language/prop.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/language/remove.php | 36++++++++++++++----------------------
modules/cms-ui/themes/default/html/views/language/remove.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/language/structure.php | 1-
modules/cms-ui/themes/default/html/views/language/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/languagelist/add.php | 13+++++++------
modules/cms-ui/themes/default/html/views/languagelist/show.php | 74+++++++++++++++++++++++++++++++++++++++++++-------------------------------
modules/cms-ui/themes/default/html/views/languagelist/show.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/link/edit.php | 20++++++--------------
modules/cms-ui/themes/default/html/views/link/edit.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/link/remove.php | 24+++++++-----------------
modules/cms-ui/themes/default/html/views/link/structure.php | 1-
modules/cms-ui/themes/default/html/views/link/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/login/license.php | 91+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
modules/cms-ui/themes/default/html/views/login/license.tpl.src.xml | 12++++++------
modules/cms-ui/themes/default/html/views/login/login.php | 163+++++++++++++++++++++++++++++++++++++++++++------------------------------------
modules/cms-ui/themes/default/html/views/login/login.tpl.src.xml | 36++++++++++++++++++------------------
modules/cms-ui/themes/default/html/views/login/openid.php | 79++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
modules/cms-ui/themes/default/html/views/login/openid.tpl.src.xml | 18+++++++++---------
modules/cms-ui/themes/default/html/views/login/password.php | 44+++++++++++++++++---------------------------
modules/cms-ui/themes/default/html/views/login/password.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/login/passwordcode.php | 40++++++++++++----------------------------
modules/cms-ui/themes/default/html/views/login/register.php | 39++++++++++++++-------------------------
modules/cms-ui/themes/default/html/views/login/register.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/login/registercode.php | 45+++++++++++++++++++--------------------------
modules/cms-ui/themes/default/html/views/model/info.php | 20++++++++++++--------
modules/cms-ui/themes/default/html/views/model/listing.php | 69++++++++++++++++++++++++++++++++++++++++-----------------------------
modules/cms-ui/themes/default/html/views/model/listing.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/model/prop.php | 29++++++++++-------------------
modules/cms-ui/themes/default/html/views/model/prop.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/model/remove.php | 36++++++++++++++----------------------
modules/cms-ui/themes/default/html/views/model/remove.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/model/structure.php | 1-
modules/cms-ui/themes/default/html/views/model/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/modellist/add.php | 12+++++++-----
modules/cms-ui/themes/default/html/views/modellist/show.php | 65++++++++++++++++++++++++++++++++++++++---------------------------
modules/cms-ui/themes/default/html/views/modellist/show.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/object/aclform.php | 112+++++++++++++++++++++++++++++++++++--------------------------------------------
modules/cms-ui/themes/default/html/views/object/aclform.tpl.src.xml | 20++++++++++----------
modules/cms-ui/themes/default/html/views/object/copy.php | 22+++++++++++++---------
modules/cms-ui/themes/default/html/views/object/copy.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/object/info.php | 229+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml | 32++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/object/inherit.php | 35+++++++++++++----------------------
modules/cms-ui/themes/default/html/views/object/inherit.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/object/name.php | 17++++++++++-------
modules/cms-ui/themes/default/html/views/object/name.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/object/prop.php | 18++++++++++--------
modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/object/rights.php | 110+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/object/settings.php | 40++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/page/changetemplate.php | 30++++++++++++++++++------------
modules/cms-ui/themes/default/html/views/page/changetemplate.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php | 20+++++++++++---------
modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/page/edit.php | 55++++++++++++++++++++++++++++++++-----------------------
modules/cms-ui/themes/default/html/views/page/edit.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/page/form.php | 153+++++++++++++++++++++++++++++++++----------------------------------------------
modules/cms-ui/themes/default/html/views/page/form.tpl.src.xml | 22+++++++++++-----------
modules/cms-ui/themes/default/html/views/page/info.php | 177+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
modules/cms-ui/themes/default/html/views/page/info.tpl.src.xml | 10+++++-----
modules/cms-ui/themes/default/html/views/page/name.php | 41+++++++++++++++++------------------------
modules/cms-ui/themes/default/html/views/page/name.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/page/preview.php | 25++++++++++++++-----------
modules/cms-ui/themes/default/html/views/page/preview.tpl.src.xml | 10+++++-----
modules/cms-ui/themes/default/html/views/page/pub.php | 35+++++++++++++----------------------
modules/cms-ui/themes/default/html/views/page/pub.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/page/remove.php | 24+++++++-----------------
modules/cms-ui/themes/default/html/views/page/show.php | 5+++--
modules/cms-ui/themes/default/html/views/page/src.php | 17+++++++++--------
modules/cms-ui/themes/default/html/views/page/src.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/page/structure.php | 1-
modules/cms-ui/themes/default/html/views/page/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/pageelement/advanced.php | 42++++++++++++++++++++++++------------------
modules/cms-ui/themes/default/html/views/pageelement/advanced.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/pageelement/diff.php | 90++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
modules/cms-ui/themes/default/html/views/pageelement/diff.tpl.src.xml | 16++++++++--------
modules/cms-ui/themes/default/html/views/pageelement/edit.php | 28++++++++++++++++------------
modules/cms-ui/themes/default/html/views/pageelement/edit.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/pageelement/export.php | 22+++++++++-------------
modules/cms-ui/themes/default/html/views/pageelement/history.php | 166+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
modules/cms-ui/themes/default/html/views/pageelement/history.tpl.src.xml | 18+++++++++---------
modules/cms-ui/themes/default/html/views/pageelement/import.php | 29+++++++++++++----------------
modules/cms-ui/themes/default/html/views/pageelement/info.php | 104+++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
modules/cms-ui/themes/default/html/views/pageelement/info.tpl.src.xml | 14+++++++-------
modules/cms-ui/themes/default/html/views/pageelement/link.php | 101+++++++++++++++++++++++++++++++------------------------------------------------
modules/cms-ui/themes/default/html/views/pageelement/link.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/pageelement/preview.php | 5+++--
modules/cms-ui/themes/default/html/views/pageelement/preview.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/pageelement/prop.php | 146+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
modules/cms-ui/themes/default/html/views/pageelement/prop.tpl.src.xml | 18+++++++++---------
modules/cms-ui/themes/default/html/views/pageelement/pub.php | 35+++++++++++++----------------------
modules/cms-ui/themes/default/html/views/pageelement/pub.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/pageelement/structure.php | 7+++----
modules/cms-ui/themes/default/html/views/pageelement/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/pageelement/value.php | 404+++++++++++++++++++++++++++++++++++++++++--------------------------------------
modules/cms-ui/themes/default/html/views/pageelement/value.tpl.src.xml | 84++++++++++++++++++++++++++++++++++++++++----------------------------------------
modules/cms-ui/themes/default/html/views/profile/confirmmail.php | 25++++++-------------------
modules/cms-ui/themes/default/html/views/profile/edit.php | 118+++++++++++++++++++++++++++++++++++++------------------------------------------
modules/cms-ui/themes/default/html/views/profile/edit.tpl.src.xml | 18+++++++++---------
modules/cms-ui/themes/default/html/views/profile/history.php | 38++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/profile/history.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/profile/mail.php | 35++++++++++++-----------------------
modules/cms-ui/themes/default/html/views/profile/mail.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/profile/memberships.php | 25++++++++++++++-----------
modules/cms-ui/themes/default/html/views/profile/pw.php | 59++++++++++++++++++++++++++---------------------------------
modules/cms-ui/themes/default/html/views/profile/pw.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/project/add.php | 54++++++++++++++++++++++++++++--------------------------
modules/cms-ui/themes/default/html/views/project/add.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/project/edit.php | 40++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/project/edit.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/project/export.php | 13+++++++------
modules/cms-ui/themes/default/html/views/project/history.php | 81++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
modules/cms-ui/themes/default/html/views/project/history.tpl.src.xml | 14+++++++-------
modules/cms-ui/themes/default/html/views/project/info.php | 13+++++++------
modules/cms-ui/themes/default/html/views/project/info.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/project/maintenance.php | 34++++++++++++++++++++--------------
modules/cms-ui/themes/default/html/views/project/maintenance.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/project/prop.php | 169++++++++++++++++++++++++++++++-------------------------------------------------
modules/cms-ui/themes/default/html/views/project/prop.tpl.src.xml | 54++++++++++++++++++++++++++++++------------------------
modules/cms-ui/themes/default/html/views/project/remove.php | 36++++++++++++++----------------------
modules/cms-ui/themes/default/html/views/project/remove.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/projectlist/add.php | 37++++++++++++++++++++++---------------
modules/cms-ui/themes/default/html/views/projectlist/add.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/projectlist/edit.php | 27++++++++++++++++-----------
modules/cms-ui/themes/default/html/views/projectlist/edit.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/projectlist/history.php | 46+++++++++++++++++++++++++++-------------------
modules/cms-ui/themes/default/html/views/projectlist/history.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/search/edit.php | 137++++++++++++++++++++++++++++---------------------------------------------------
modules/cms-ui/themes/default/html/views/search/edit.tpl.src.xml | 12++++++------
modules/cms-ui/themes/default/html/views/search/result.php | 27++++++++++++++++-----------
modules/cms-ui/themes/default/html/views/search/result.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/start/applications.php | 25++++++++++++++-----------
modules/cms-ui/themes/default/html/views/start/applications.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/start/projectmenu.php | 62+++++++++++++++++++++++++-------------------------------------
modules/cms-ui/themes/default/html/views/start/projectmenu.tpl.src.xml | 10+++++-----
modules/cms-ui/themes/default/html/views/start/userprojecttimeline.php | 64+++++++++++++++++++++++++++++++++++++---------------------------
modules/cms-ui/themes/default/html/views/start/userprojecttimeline.tpl.src.xml | 12++++++------
modules/cms-ui/themes/default/html/views/template/addel.php | 44+++++++++++++++++++-------------------------
modules/cms-ui/themes/default/html/views/template/addel.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/template/edit.php | 70+++++++++++++++++++++++++++++++++++++++++-----------------------------
modules/cms-ui/themes/default/html/views/template/edit.tpl.src.xml | 14+++++++-------
modules/cms-ui/themes/default/html/views/template/extension.php | 18++++++++++--------
modules/cms-ui/themes/default/html/views/template/extension.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/template/info.php | 29+++++++++++++++++------------
modules/cms-ui/themes/default/html/views/template/info.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/template/listing.php | 28++++++++++++++++------------
modules/cms-ui/themes/default/html/views/template/listing.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/template/preview.php | 29+++++++++++++++++------------
modules/cms-ui/themes/default/html/views/template/preview.tpl.src.xml | 6+++---
modules/cms-ui/themes/default/html/views/template/prop.php | 35+++++++++++++++++++++--------------
modules/cms-ui/themes/default/html/views/template/pub.php | 35+++++++++++++----------------------
modules/cms-ui/themes/default/html/views/template/pub.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/template/remove.php | 36++++++++++++++----------------------
modules/cms-ui/themes/default/html/views/template/remove.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/template/src.php | 14++++++++------
modules/cms-ui/themes/default/html/views/template/src.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/template/srcelement.php | 56++++++++++++++++++++++++++++++++------------------------
modules/cms-ui/themes/default/html/views/templatelist/add.php | 46+++++++++++++++++++++++++++-------------------
modules/cms-ui/themes/default/html/views/templatelist/add.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/templatelist/show.php | 36+++++++++++++++++++++---------------
modules/cms-ui/themes/default/html/views/templatelist/show.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/text/compress.php | 40++++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/text/compress.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/text/edit.php | 18+++++++++++-------
modules/cms-ui/themes/default/html/views/text/extract.php | 12++++--------
modules/cms-ui/themes/default/html/views/text/preview.php | 5+++--
modules/cms-ui/themes/default/html/views/text/preview.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/text/pub.php | 26++++++++++++--------------
modules/cms-ui/themes/default/html/views/text/pub.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/text/remove.php | 50+++++++++++++++++++-------------------------------
modules/cms-ui/themes/default/html/views/text/show.php | 5+++--
modules/cms-ui/themes/default/html/views/text/size.php | 99+++++++++++++++++++++++++++++++++++++++++--------------------------------------
modules/cms-ui/themes/default/html/views/text/size.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/text/structure.php | 1-
modules/cms-ui/themes/default/html/views/text/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/text/uncompress.php | 30++++++++++++++++++------------
modules/cms-ui/themes/default/html/views/text/uncompress.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/text/value.php | 24+++++++++++-------------
modules/cms-ui/themes/default/html/views/text/value.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/title/ping.php | 5+++--
modules/cms-ui/themes/default/html/views/title/show.php | 408+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml | 144++++++++++++++++++++++++++++++++++++++++----------------------------------------
modules/cms-ui/themes/default/html/views/url/edit.php | 14++++++++------
modules/cms-ui/themes/default/html/views/url/preview.php | 8+++++---
modules/cms-ui/themes/default/html/views/url/preview.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/url/remove.php | 24+++++++-----------------
modules/cms-ui/themes/default/html/views/url/structure.php | 1-
modules/cms-ui/themes/default/html/views/url/structure.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/user/add.php | 11++++++-----
modules/cms-ui/themes/default/html/views/user/history.php | 38++++++++++++++++++++++----------------
modules/cms-ui/themes/default/html/views/user/history.tpl.src.xml | 8++++----
modules/cms-ui/themes/default/html/views/user/info.php | 155++++++++++++++++++++++++++++++++++++++++++-------------------------------------
modules/cms-ui/themes/default/html/views/user/info.tpl.src.xml | 28++++++++++++++--------------
modules/cms-ui/themes/default/html/views/user/listing.php | 57++++++++++++++++++++++++++++++++++-----------------------
modules/cms-ui/themes/default/html/views/user/listing.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/user/memberships.php | 44++++++++++++++++++--------------------------
modules/cms-ui/themes/default/html/views/user/memberships.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/user/prop.php | 131+++++++++++++++++++++++++++++++++----------------------------------------------
modules/cms-ui/themes/default/html/views/user/prop.tpl.src.xml | 16++++++++--------
modules/cms-ui/themes/default/html/views/user/pw.php | 91++++++++++++++++++++++++++++++++++---------------------------------------------
modules/cms-ui/themes/default/html/views/user/pw.tpl.src.xml | 10+++++-----
modules/cms-ui/themes/default/html/views/user/remove.php | 32+++++++++++---------------------
modules/cms-ui/themes/default/html/views/user/remove.tpl.src.xml | 4++--
modules/cms-ui/themes/default/html/views/user/rights.php | 127++++++++++++++++++++++++++++++++++++++++++-------------------------------------
modules/cms-ui/themes/default/html/views/user/rights.tpl.src.xml | 14+++++++-------
modules/cms-ui/themes/default/html/views/userlist/add.php | 11++++++-----
modules/cms-ui/themes/default/html/views/userlist/show.php | 65+++++++++++++++++++++++++++++++++++++++--------------------------
modules/cms-ui/themes/default/html/views/userlist/show.tpl.src.xml | 14+++++++-------
modules/template-engine/CMSElement.class.php | 27+++++++++++++++++++++++++++
modules/template-engine/Element.class.php | 173++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
modules/template-engine/HtmlElement.class.php | 58++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
modules/template-engine/PHPBlockElement.class.php | 171+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
modules/template-engine/TemplateCompiler.php | 4++++
modules/template-engine/components/html/Component.class.php | 184+++----------------------------------------------------------------------------
modules/template-engine/components/html/FieldComponent.class.php | 18++----------------
modules/template-engine/components/html/button/Button.class.php | 10+++++++++-
modules/template-engine/components/html/checkbox/Checkbox.class.php | 52+++++++++++++++++++++++++---------------------------
modules/template-engine/components/html/column/Column.class.php | 72++++++++++++++++++++++++++++++++----------------------------------------
modules/template-engine/components/html/date/Date.class.php | 22+++++++++++-----------
modules/template-engine/components/html/dummy/Dummy.class.php | 13++++++++-----
modules/template-engine/components/html/editor/Editor.class.php | 50+++++++++++++++++++++++++-------------------------
modules/template-engine/components/html/else/Else.class.php | 19++++++++-----------
modules/template-engine/components/html/focus/Focus.class.php | 25++++++-------------------
modules/template-engine/components/html/form/Form.class.php | 203+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
modules/template-engine/components/html/group/Group.class.php | 61+++++++++++++++++++++++++++++++++++++++----------------------
modules/template-engine/components/html/group/group.css | 8++++----
modules/template-engine/components/html/group/group.js | 2+-
modules/template-engine/components/html/group/group.less | 9++++-----
modules/template-engine/components/html/group/group.min.css | 4++--
modules/template-engine/components/html/group/group.min.js | 4++--
modules/template-engine/components/html/header/Header.class.php | 9++++++++-
modules/template-engine/components/html/hidden/Hidden.class.php | 38++++++++++++++++++--------------------
modules/template-engine/components/html/if/If.class.php | 53++++++++++++++++++++++++++---------------------------
modules/template-engine/components/html/image/Image.class.php | 79+++++++++++++++++++++++++++++++++++++------------------------------------------
modules/template-engine/components/html/include/Include.class.php | 6++++--
modules/template-engine/components/html/input/Input.class.php | 110++++++++++++++++++++++++++-----------------------------------------------------
modules/template-engine/components/html/inputarea/Inputarea.class.php | 68+++++++++++++++++++++++++++++++++++++++-----------------------------
modules/template-engine/components/html/insert/Insert.class.php | 40+++++++++++++++++++++-------------------
modules/template-engine/components/html/label/Label.class.php | 49+++++++++++++++++++++++--------------------------
modules/template-engine/components/html/link/Link.class.php | 131++++++++++++++++++++++++++++++++++---------------------------------------------
modules/template-engine/components/html/list/List.class.php | 21++++++++++-----------
modules/template-engine/components/html/logo/Logo.class.php | 55++++++++++++++++++++++++-------------------------------
modules/template-engine/components/html/newline/Newline.class.php | 3+++
modules/template-engine/components/html/output/Output.class.php | 14+++++++++-----
modules/template-engine/components/html/page/Page.class.php | 15+++++++++++++++
modules/template-engine/components/html/page/Window.class.php | 11-----------
modules/template-engine/components/html/part/Part.class.php | 23++++++++++-------------
modules/template-engine/components/html/password/Password.class.php | 55+++++++++++++++++++++++++++----------------------------
modules/template-engine/components/html/qrcode/Qrcode.class.php | 32++++++++++++++++++--------------
modules/template-engine/components/html/radio/Radio.class.php | 47+++++++++++++++++++++++++----------------------
modules/template-engine/components/html/radiobox/Radiobox.class.php | 23++++++++++++++++-------
modules/template-engine/components/html/row/Row.class.php | 21+++++++++------------
modules/template-engine/components/html/selectbox/Selectbox.class.php | 95++++++++++++++++++++++++++++++++++++++++++-------------------------------------
modules/template-engine/components/html/selector/Selector.class.php | 11+++++++++--
modules/template-engine/components/html/set/Set.class.php | 28++++++++++++++++------------
modules/template-engine/components/html/table/Table.class.php | 46+++++++++++++++++++++++++---------------------
modules/template-engine/components/html/text/Text.class.php | 105++++++++++++++++++++++++++-----------------------------------------------------
modules/template-engine/components/html/tree/Tree.class.php | 19+++++++++++--------
modules/template-engine/components/html/upload/Upload.class.php | 51++++++++++++++++++++++++---------------------------
modules/template-engine/components/html/user/User.class.php | 18+++++++++---------
modules/template-engine/components/html/window/Window.class.php | 9+++++++++
modules/template-engine/engine/TemplateEngine.class.php | 5++++-
modules/template-engine/require.php | 3+++
modules/util/Http.class.php | 2+-
366 files changed, 6853 insertions(+), 6244 deletions(-)

diff --git a/.gitignore b/.gitignore @@ -1,3 +1,4 @@ .idea config/config-*.yml -log/cms-*.log- \ No newline at end of file +log/cms-*.log +/audit-log/ diff --git a/modules/cms-ui/themes/default/html/views/README.md b/modules/cms-ui/themes/default/html/views/README.md @@ -0,0 +1,19 @@ +## OpenRat CMS Templates + +All views are desribe within a XML file with the extension `.tpl.src.xml`. + +These views are compiled to `.php` files. + +# Components + +You may use the following namespaces for the source xml files: + +- `http://www.openrat.de/template` for special CMS components. +- `http://www.w3.org/1999/xhtml` for HTML5 components. + +# Variables + +- `${variable.name}` outputs a data variable +- `#{messagekey}` outputs a i18n message +- `%{config/subconfig/value}` outputs a configuration value + diff --git a/modules/cms-ui/themes/default/html/views/configuration/show.php b/modules/cms-ui/themes/default/html/views/configuration/show.php @@ -1,21 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_VALUE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> </tr> - <?php foreach($config as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($config as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($key))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$key)) ?> + </span> </td> - <td class="<?php echo $class ?>"> - <span class="<?php echo $class ?>"><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span> + <td class="<?php echo encodeHtml(htmlentities(@$class)) ?>"> + <span class="<?php echo encodeHtml(htmlentities(@$class)) ?>"><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/configuration/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/configuration/show.tpl.src.xml @@ -14,8 +14,8 @@ <column> <text var="key"></text> </column> - <column class="var:class"> - <text class="var:class" var="value"></text> + <column class="${class}"> + <text class="${class}" var="value"></text> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/configuration/src.php b/modules/cms-ui/themes/default/html/views/configuration/src.php @@ -1 +1,3 @@ -<?php if (!defined('OR_TITLE')) die('Forbidden'); ?><textarea name="<?php if ('') echo ''.'_' ?>source<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo htmlentities(${'source'}) ?></textarea>- \ No newline at end of file +<?php if (!defined('OR_TITLE')) die('Forbidden'); ?> +<textarea name="source" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"> +</textarea>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.php b/modules/cms-ui/themes/default/html/views/element/advanced.php @@ -1,303 +1,299 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','disable_dynamic_code')); if($if2){?> - <?php $if3=(!true); if($if3){?> + <?php $if2=(config('security','disable_dynamic_code')); if($if2) { ?> + <?php $if3=(!true); if($if3) { ?> <div class="message warn"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOTICE_CODE_DISABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NOTICE_CODE_DISABLED'))) ?> + </span> </div> - <?php } ?> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="advanced" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> - <?php $if4=(isset($subtype)); if($if4){?> + <?php } ?> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if4=(isset($subtype)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_SUBTYPE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_SUBTYPE'))) ?> + </span> </div> <div class="input"> - <?php $if7=(isset($subtypes)); if($if7){?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_subtype" name="subtype" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($subtypes,$subtype,1,0) ?><?php if (count($subtypes)==0) { ?><input type="hidden" name="subtype" value="" /><?php } ?><?php if (count($subtypes)==1) { ?><input type="hidden" name="subtype" value="<?php echo array_keys($subtypes)[0] ?>" /><?php } ?> - </select></div> - <?php } ?> - <?php $if7=!(isset($subtypes)); if($if7){?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_subtype" name="<?php if ('') echo ''.'_' ?>subtype<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if (false) { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div> - <?php } ?> + <?php $if7=(isset($subtypes)); if($if7) { ?> + <input name="subtype" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" size="1" class=""> + </input> + <?php } ?> + <?php $if7=!(isset($subtypes)); if($if7) { ?> + <input name="subtype" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> + </input> + <?php } ?> </div> </div> - <?php } ?> - <?php $if4=(isset($with_icon)); if($if4){?> + <?php } ?> + <?php $if4=(isset($with_icon)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'with_icon';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_with_icon" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span> + <input type="checkbox" name="with_icon" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$with_icon)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($inherit)); if($if4){?> + <?php } ?> + <?php $if4=(isset($inherit)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'inherit';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_inherit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_INHERIT')))); ?></span> + <input type="checkbox" name="inherit" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_INHERIT'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($all_languages)); if($if4){?> + <?php } ?> + <?php $if4=(isset($all_languages)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'all_languages';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_all_languages" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span> + <input type="checkbox" name="all_languages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$all_languages)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($writable)); if($if4){?> + <?php } ?> + <?php $if4=(isset($writable)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'writable';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_writable" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span> + <input type="checkbox" name="writable" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$writable)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($width)); if($if4){?> + <?php } ?> + <?php $if4=(isset($width)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('width'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($height)); if($if4){?> + <?php } ?> + <?php $if4=(isset($height)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('height'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($dateformat)); if($if4){?> + <?php } ?> + <?php $if4=(isset($dateformat)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DATEFORMAT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dateformat" name="dateformat" title="" class=""<?php if (count($dateformats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dateformats,$dateformat,0,0) ?><?php if (count($dateformats)==0) { ?><input type="hidden" name="dateformat" value="" /><?php } ?><?php if (count($dateformats)==1) { ?><input type="hidden" name="dateformat" value="<?php echo array_keys($dateformats)[0] ?>" /><?php } ?> - </select></div> + <input name="dateformat" value="<?php echo encodeHtml(htmlentities(@$dateformat)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($format)); if($if4){?> + <?php } ?> + <?php $if4=(isset($format)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_FORMAT'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('format',$formatlist,$format) ?> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(format,$formatlist,${format}) ?> ?> + <?php } ?> </div> </div> - <?php } ?> - <?php $if4=(isset($decimals)); if($if4){?> + <?php } ?> + <?php $if4=(isset($decimals)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DECIMALS'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_decimals" name="<?php if ('') echo ''.'_' ?>decimals<?php if (false) echo '_disabled' ?>" type="text" maxlength="2" class="" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if (false) { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div> + <input name="decimals" disabled="" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($dec_point)); if($if4){?> + <?php } ?> + <?php $if4=(isset($dec_point)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEC_POINT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_dec_point" name="<?php if ('') echo ''.'_' ?>dec_point<?php if (false) echo '_disabled' ?>" type="text" maxlength="5" class="" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if (false) { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div> + <input name="dec_point" disabled="" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($thousand_sep)); if($if4){?> + <?php } ?> + <?php $if4=(isset($thousand_sep)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_thousand_sep'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_thousand_sep" name="<?php if ('') echo ''.'_' ?>thousand_sep<?php if (false) echo '_disabled' ?>" type="text" maxlength="1" class="" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if (false) { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div> + <input name="thousand_sep" disabled="" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($default_text)); if($if4){?> + <?php } ?> + <?php $if4=(isset($default_text)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_text'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_default_text" name="<?php if ('') echo ''.'_' ?>default_text<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if (false) { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div> + <input name="default_text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($default_longtext)); if($if4){?> + <?php } ?> + <?php $if4=(isset($default_longtext)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_longtext'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>default_longtext<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div> + <textarea name="default_longtext" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$default_longtext)) ?> + </textarea> </div> </div> - <?php } ?> - <?php $if4=(isset($parameters)); if($if4){?> + <?php } ?> + <?php $if4=(isset($parameters)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DYNAMIC_PARAMETERS'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>parameters<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($parameters) ?></textarea></div> + <textarea name="parameters" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$parameters)) ?> + </textarea> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue){ ?> - <span><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span> - <span><?php echo nl2br('&nbsp;('); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DEFAULT')))); ?></span> - <span><?php echo nl2br(')&nbsp;=&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span> - <br/> - <?php } ?> + <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@$paramName)) ?> + </span> + <span class=""> ( + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DEFAULT'))) ?> + </span> + <span class="">) = + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$defaultValue)) ?> + </span> + <br> + </br> + <?php } ?> </div> </div> - <?php } ?> - <?php $if4=(isset($select_items)); if($if4){?> + <?php } ?> + <?php $if4=(isset($select_items)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_select_items'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>select_items<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($select_items) ?></textarea></div> + <textarea name="select_items" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$select_items)) ?> + </textarea> </div> </div> - <?php } ?> - <?php $if4=(isset($linkelement)); if($if4){?> + <?php } ?> + <?php $if4=(isset($linkelement)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_LINK'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkelement" name="linkelement" title="" class=""<?php if (count($linkelements)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($linkelements,$linkelement,0,0) ?><?php if (count($linkelements)==0) { ?><input type="hidden" name="linkelement" value="" /><?php } ?><?php if (count($linkelements)==1) { ?><input type="hidden" name="linkelement" value="<?php echo array_keys($linkelements)[0] ?>" /><?php } ?> - </select></div> + <input name="linkelement" value="<?php echo encodeHtml(htmlentities(@$linkelement)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($name)); if($if4){?> + <?php } ?> + <?php $if4=(isset($name)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_name" name="name" title="" class=""<?php if (count($names)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($names,$name,0,0) ?><?php if (count($names)==0) { ?><input type="hidden" name="name" value="" /><?php } ?><?php if (count($names)==1) { ?><input type="hidden" name="name" value="<?php echo array_keys($names)[0] ?>" /><?php } ?> - </select></div> + <input name="name" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($folderobjectid)); if($if4){?> + <?php } ?> + <?php $if4=(isset($folderobjectid)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_FOLDEROBJECT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_folderobjectid" name="folderobjectid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$folderobjectid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="folderobjectid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="folderobjectid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div> + <input name="folderobjectid" value="<?php echo encodeHtml(htmlentities(@$folderobjectid)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($default_objectid)); if($if4){?> + <?php } ?> + <?php $if4=(isset($default_objectid)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_OBJECT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_default_objectid" name="default_objectid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$default_objectid,1,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="default_objectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="default_objectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <input name="default_objectid" value="<?php echo encodeHtml(htmlentities(@$default_objectid)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($code)); if($if4){?> + <?php } ?> + <?php $if4=(isset($code)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_code'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($code) ?></textarea></div> + <textarea name="code" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$code)) ?> + </textarea> </div> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.tpl.src.xml b/modules/cms-ui/themes/default/html/views/element/advanced.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <if true="config:security/disable_dynamic_code"> - <if value="var:type" equals="code" false="true"> + <if true="%{security/disable_dynamic_code}"> + <if value="${type}" equals="code" false="true"> <part class="message warn"> <text key="NOTICE_CODE_DISABLED"/> </part> diff --git a/modules/cms-ui/themes/default/html/views/element/info.php b/modules/cms-ui/themes/default/html/views/element/info.php @@ -1,30 +1,37 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'type'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </td> - <td> - <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('el_'.$type.'')))); ?></span> + <td class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${type'))) ?>} + </span> </td> </tr> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> <td class="clickable"> - <a class="" target="_self" data-type="edit" data-action="element" data-method="prop" data-id="<?php echo $id ?>" data-extra="[]" href="./#/element/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-type="edit" data-action="element" data-method="prop" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/element/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('id'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($id))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$id)) ?> + </span> </td> </tr> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/element/info.tpl.src.xml @@ -6,8 +6,8 @@ <text key="type" /> </column> <column> - <image elementtype="var:type" /> - <text key="var:type" prefix="el_" /> + <image elementtype="${type}" /> + <text key="${type}" prefix="el_" /> </column> </row> <row class="data"> @@ -15,7 +15,7 @@ <text key="name" /> </column> <column class="clickable"> - <link class="" type="edit" action="element" subaction="prop" id="var:id"> + <link class="" type="edit" action="element" subaction="prop" id="${id}"> <text var="name" /> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/element/name.php b/modules/cms-ui/themes/default/html/views/element/name.php @@ -1,27 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="name" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <td class=""> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DESCRIPTION')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DESCRIPTION'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div> + <td class=""> + <textarea name="description" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/prop.php b/modules/cms-ui/themes/default/html/views/element/prop.php @@ -1,40 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LABEL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LABEL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_label" name="<?php if ('') echo ''.'_' ?>label<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="100" class="" value="<?php echo Text::encodeHtml(@$label) ?>" /><?php if (false) { ?><input type="hidden" name="label" value="<?php $label ?>"/><?php } ?></div> + <input name="label" disabled="" required="required" autofocus="autofocus" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$label)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" required="required" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div> + <textarea name="description" disabled="" maxlength="255" class="inputarea"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_TYPE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_TYPE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_typeid" name="typeid" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$typeid,0,1) ?><?php if (count($types)==0) { ?><input type="hidden" name="typeid" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="typeid" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <input name="typeid" value="<?php echo encodeHtml(htmlentities(@$typeid)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/properties.php b/modules/cms-ui/themes/default/html/views/element/properties.php @@ -1,272 +1,273 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="properties" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="properties" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if5=(isset($subtype)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_SUBTYPE')))); ?></span> - </td> - <td> - <?php $if8=(isset($subtypes)); if($if8){?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_subtype" name="subtype" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($subtypes,$subtype,1,0) ?><?php if (count($subtypes)==0) { ?><input type="hidden" name="subtype" value="" /><?php } ?><?php if (count($subtypes)==1) { ?><input type="hidden" name="subtype" value="<?php echo array_keys($subtypes)[0] ?>" /><?php } ?> - </select></div> - <?php } ?> - <?php $if8=!(isset($subtypes)); if($if8){?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_subtype" name="<?php if ('') echo ''.'_' ?>subtype<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if (false) { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div> - <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="properties" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <?php $if5=(isset($subtype)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_SUBTYPE'))) ?> + </span> + </td> + <td class=""> + <?php $if8=(isset($subtypes)); if($if8) { ?> + <input name="subtype" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" size="1" class=""> + </input> + <?php } ?> + <?php $if8=!(isset($subtypes)); if($if8) { ?> + <input name="subtype" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> + </input> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if5=(isset($with_icon)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span> - </td> - <td> - <?php { $tmpname = 'with_icon';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php } ?> + <?php $if5=(isset($with_icon)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> + </span> + </td> + <td class=""> + <input type="checkbox" name="with_icon" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$with_icon)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($all_languages)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span> - </td> - <td> - <?php { $tmpname = 'all_languages';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php } ?> + <?php $if5=(isset($all_languages)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> + </span> + </td> + <td class=""> + <input type="checkbox" name="all_languages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$all_languages)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($writable)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span> - </td> - <td> - <?php { $tmpname = 'writable';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php } ?> + <?php $if5=(isset($writable)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> + </span> + </td> + <td class=""> + <input type="checkbox" name="writable" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$writable)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($width)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span> + <?php } ?> + <?php $if5=(isset($width)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('width'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> + <td class=""> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($height)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span> + <?php } ?> + <?php $if5=(isset($height)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('height'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <td class=""> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($dateformat)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span> + <?php } ?> + <?php $if5=(isset($dateformat)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DATEFORMAT'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dateformat" name="dateformat" title="" class=""<?php if (count($dateformats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dateformats,$dateformat,0,0) ?><?php if (count($dateformats)==0) { ?><input type="hidden" name="dateformat" value="" /><?php } ?><?php if (count($dateformats)==1) { ?><input type="hidden" name="dateformat" value="<?php echo array_keys($dateformats)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="dateformat" value="<?php echo encodeHtml(htmlentities(@$dateformat)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($format)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span> + <?php } ?> + <?php $if5=(isset($format)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_FORMAT'))) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('format',$formatlist,$format) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(format,$formatlist,${format}) ?> ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if5=(isset($decimals)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span> + <?php } ?> + <?php $if5=(isset($decimals)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DECIMALS'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_decimals" name="<?php if ('') echo ''.'_' ?>decimals<?php if (false) echo '_disabled' ?>" type="text" maxlength="2" class="" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if (false) { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div> + <td class=""> + <input name="decimals" disabled="" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($dec_point)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span> + <?php } ?> + <?php $if5=(isset($dec_point)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEC_POINT'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_dec_point" name="<?php if ('') echo ''.'_' ?>dec_point<?php if (false) echo '_disabled' ?>" type="text" maxlength="5" class="" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if (false) { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div> + <td class=""> + <input name="dec_point" disabled="" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($thousand_sep)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span> + <?php } ?> + <?php $if5=(isset($thousand_sep)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_thousand_sep'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_thousand_sep" name="<?php if ('') echo ''.'_' ?>thousand_sep<?php if (false) echo '_disabled' ?>" type="text" maxlength="1" class="" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if (false) { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div> + <td class=""> + <input name="thousand_sep" disabled="" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($default_text)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span> + <?php } ?> + <?php $if5=(isset($default_text)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_text'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_default_text" name="<?php if ('') echo ''.'_' ?>default_text<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if (false) { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div> + <td class=""> + <input name="default_text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($default_longtext)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span> + <?php } ?> + <?php $if5=(isset($default_longtext)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_longtext'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>default_longtext<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div> + <td class=""> + <textarea name="default_longtext" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$default_longtext)) ?> + </textarea> </td> </tr> - <?php } ?> - <?php $if5=(isset($parameters)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span> + <?php } ?> + <?php $if5=(isset($parameters)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DYNAMIC_PARAMETERS'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>parameters<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($parameters) ?></textarea></div> + <td class=""> + <textarea name="parameters" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$parameters)) ?> + </textarea> </td> </tr> - <tr> - <td> - </td> - <td> - <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue){ ?> - <span><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span> - <span><?php echo nl2br('&nbsp;('); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DEFAULT')))); ?></span> - <span><?php echo nl2br(')&nbsp;=&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span> - <br/> - <?php } ?> + <tr class=""> + <td class=""> + </td> + <td class=""> + <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@$paramName)) ?> + </span> + <span class=""> ( + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DEFAULT'))) ?> + </span> + <span class="">) = + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$defaultValue)) ?> + </span> + <br> + </br> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if5=(isset($select_items)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span> + <?php } ?> + <?php $if5=(isset($select_items)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_select_items'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>select_items<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($select_items) ?></textarea></div> + <td class=""> + <textarea name="select_items" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$select_items)) ?> + </textarea> </td> </tr> - <?php } ?> - <?php $if5=(isset($linkelement)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span> + <?php } ?> + <?php $if5=(isset($linkelement)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_LINK'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkelement" name="linkelement" title="" class=""<?php if (count($linkelements)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($linkelements,$linkelement,0,0) ?><?php if (count($linkelements)==0) { ?><input type="hidden" name="linkelement" value="" /><?php } ?><?php if (count($linkelements)==1) { ?><input type="hidden" name="linkelement" value="<?php echo array_keys($linkelements)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="linkelement" value="<?php echo encodeHtml(htmlentities(@$linkelement)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($name)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> + <?php } ?> + <?php $if5=(isset($name)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_name" name="name" title="" class=""<?php if (count($names)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($names,$name,0,0) ?><?php if (count($names)==0) { ?><input type="hidden" name="name" value="" /><?php } ?><?php if (count($names)==1) { ?><input type="hidden" name="name" value="<?php echo array_keys($names)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="name" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($folderobjectid)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span> + <?php } ?> + <?php $if5=(isset($folderobjectid)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_FOLDEROBJECT'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_folderobjectid" name="folderobjectid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$folderobjectid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="folderobjectid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="folderobjectid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="folderobjectid" value="<?php echo encodeHtml(htmlentities(@$folderobjectid)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($default_objectid)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span> + <?php } ?> + <?php $if5=(isset($default_objectid)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_OBJECT'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_default_objectid" name="default_objectid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$default_objectid,1,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="default_objectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="default_objectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="default_objectid" value="<?php echo encodeHtml(htmlentities(@$default_objectid)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($code)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span> + <?php } ?> + <?php $if5=(isset($code)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_code'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($code) ?></textarea></div> + <td class=""> + <textarea name="code" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$code)) ?> + </textarea> </td> </tr> - <?php } ?> - <tr> + <?php } ?> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/remove.php b/modules/cms-ui/themes/default/html/views/element/remove.php @@ -1,35 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'ELEMENT_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> @@ -37,18 +29,25 @@ <div class="label"> </div> <div class="input"> - <span><?php echo nl2br('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'); ?></span> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_value" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="value"<?php if('value'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_value" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_DELETE_VALUES')))); ?></span> + <span class=""> + </span> + <input type="radio" name="type" disabled="" value="value" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_DELETE_VALUES'))) ?> + </span> </label> - <br/> - <span><?php echo nl2br('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'); ?></span> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_all" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('DELETE')))); ?></span> + <br> + </br> + <span class=""> + </span> + <input type="radio" name="type" disabled="" value="all" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/element/remove.tpl.src.xml @@ -12,7 +12,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/file/advanced.php b/modules/cms-ui/themes/default/html/views/file/advanced.php @@ -1,6 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="advanced" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('file_extension') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="<?php if ('') echo ''.'_' ?>extension<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if (false) { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?type?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div></span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <label class="or-form-row or-form-input"><input name="extension" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$extension)) ?>" class="extension"> + </input></label> + <label class="or-form-row or-form-input"><input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/compress.php b/modules/cms-ui/themes/default/html/views/file/compress.php @@ -1,25 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="compress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPTIONS') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </div> <div class="input"> - <?php $gz= 'gz'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,'gz',0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $gz= 'gz'; ?> + <?php } ?> + <input name="format" value="gz" size="1" class=""> + </input> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/compress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/compress.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:OPTIONS"> + <group title="#{OPTIONS}"> <part class="line"> <part class="label"> <text text="type"></text> diff --git a/modules/cms-ui/themes/default/html/views/file/edit.php b/modules/cms-ui/themes/default/html/views/file/edit.php @@ -1,13 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="languageid" value="<?php echo $languageid ?>" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> <div class="line"> <div class="label"> </div> <div class="input"> - <br/> - <input size="40" id="req0_file" type="file" name="file" class="upload" /> - <br/> - <br/> + <br> + </br> + <input id="req0_file" name="file" size="40" class="upload"> + </input> + <br> + </br> + <br> + </br> </div> </div> <div class="line or-dropzone-upload"> @@ -16,4 +20,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/edit.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form languageid="var:languageid"> + <form languageid="${languageid}"> <part class="line"> <part class="label" /> diff --git a/modules/cms-ui/themes/default/html/views/file/extract.php b/modules/cms-ui/themes/default/html/views/file/extract.php @@ -1,11 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extract" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/info.php b/modules/cms-ui/themes/default/html/views/file/info.php @@ -1,160 +1,205 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_filename'))) ?> + </span> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('file_extension'))) ?> + </span> </div> <div class="input"> - <span class="extension"><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + <span class="extension"><?php echo encodeHtml(htmlentities(@$extension)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_description'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$full_filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_size" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_SIZE'))) ?> + </span> </label> </div> <div class="input"> </div> - <span><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$size)) ?> + </span> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mimetype" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_mimetype'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> - <br/> - <a class="action" target="_self" data-action="file" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$mimetype)) ?> + </span> + <br> + </br> + <a target="_self" data-action="file" data-method="size" data-id="" data-extra="[]" href="/#/file/" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_size'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('#{id'))) ?>} + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$objectid)) ?> + </span> </div> </div> - <?php $if4=(isset($cache_filename)); if($if4){?> + <?php $if4=(isset($cache_filename)); if($if4) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_cache_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CACHE_FILENAME'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($cache_filemtime) ?> + <span class=""><?php echo encodeHtml(htmlentities(@$cache_filename)) ?> + </span> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> + <?php } ?> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_PAGES'))) ?> + </span> </label> </div> <div class="input"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php foreach($pages as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr> - <td> - <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="info" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon_page.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($pages as $list_key=>$list_value) { extract($list_value); ?> + <tr class=""> + <td class=""> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_page.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php $if6=(($pages)==FALSE); if($if6){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> - <?php } ?> + <?php $if6=(($pages)==FALSE); if($if6) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_created'))) ?> + </span> </div> <div class="input"> - <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) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_lastchange'))) ?> + </span> </div> <div class="input"> - <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) ?> - <br/> - <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) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_published'))) ?> + </span> </label> </div> <div class="input"> - <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($published_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($published_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php } ?> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml @@ -36,7 +36,7 @@ </part> </group> - <group title="message:additional_info"> + <group title="#{additional_info}"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -73,7 +73,7 @@ </part> <part class="line"> <part class="label"> - <text text="message:id"></text> + <text text="#{id}"></text> </part> <part class="input"> <text var="objectid"></text> @@ -90,7 +90,7 @@ <text var="cache_filename"></text> <newline></newline> <image icon="el_date"></image> - <date date="var:cache_filemtime"></date> + <date date="${cache_filemtime}"></date> </part> </part> </if> @@ -105,7 +105,7 @@ <list list="pages" extract="true"> <row> <column> - <link url="var:url" target="cms_main"> + <link url="${url}" target="cms_main"> <image type="page"></image> <text var="name"></text> </link> @@ -119,17 +119,17 @@ </part> </part> </group> - <group title="message:prop_userinfo"> + <group title="#{prop_userinfo}"> <part class="line"> <part class="label"> <text text="global_created"></text> </part> <part class="input"> <image elementtype="date"></image> - <date date="var:create_date"></date> + <date date="${create_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:create_user"></user> + <user user="${create_user}"></user> </part> </part> <part class="line"> @@ -138,10 +138,10 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </part> </part> <part class="line"> @@ -152,10 +152,10 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:published_date"></date> + <date date="${published_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:published_user"></user> + <user user="${published_user}"></user> </part> </part> </group> diff --git a/modules/cms-ui/themes/default/html/views/file/preview.php b/modules/cms-ui/themes/default/html/views/file/preview.php @@ -1,6 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="clickable"> - <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LINK_OPEN_IN_NEW_WINDOW'.'')))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" data-type="popup" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LINK_OPEN_IN_NEW_WINDOW'))) ?> + </span> </a> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/preview.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="clickable"> - <link type="popup" url="var:preview_url" class="action"> + <link type="popup" url="${preview_url}" class="action"> <text key="LINK_OPEN_IN_NEW_WINDOW" /> </link> </part> diff --git a/modules/cms-ui/themes/default/html/views/file/pub.php b/modules/cms-ui/themes/default/html/views/file/pub.php @@ -1,21 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <br/> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form file"> + <tr class=""> + <td class=""> + <br> + </br> </td> </tr> - <tr> + <tr class=""> <td class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="true" label="message:publish" async="true"> + <form cancel="true" label="#{publish}" async="true"> <row> <column> <newline></newline> diff --git a/modules/cms-ui/themes/default/html/views/file/remove.php b/modules/cms-ui/themes/default/html/views/file/remove.php @@ -1,17 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?>&nbsp;?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/show.php b/modules/cms-ui/themes/default/html/views/file/show.php @@ -1 +1,2 @@ -<?php if (!defined('OR_TITLE')) die('Forbidden'); ?><?php echo $value; ?>- \ No newline at end of file +<?php if (!defined('OR_TITLE')) die('Forbidden'); ?> +<?php echo @$value ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/structure.php b/modules/cms-ui/themes/default/html/views/file/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/structure.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/uncompress.php b/modules/cms-ui/themes/default/html/views/file/uncompress.php @@ -1,21 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="uncompress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/uncompress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/file/value.php b/modules/cms-ui/themes/default/html/views/file/value.php @@ -1,19 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> - <td> - <textarea name="<?php if ('') echo ''.'_' ?>value<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'value'}) ?></textarea> + <td class=""> + <textarea name="value" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/advanced.php b/modules/cms-ui/themes/default/html/views/folder/advanced.php @@ -1,133 +1,109 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <?php { $tmpname = 'checkall';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <input type="checkbox" name="checkall" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$checkall)) ?>" class=""> + </input> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span><?php echo nl2br('&nbsp;/&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> + <span class=""> / + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> </tr> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td width="1%"> - <?php $if7=($writable); if($if7){?> - <?php { $tmpname = $id;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <?php } ?> - <?php $if7=(!'writable'); if($if7){?> - <span><?php echo nl2br('&nbsp;'); ?></span> - <?php } ?> + <td width="1%" class=""> + <?php $if7=($writable); if($if7) { ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${id)) ?>}" class=""> + </input> + <?php } ?> + <?php $if7=(!'writable'); if($if7) { ?> + <span class=""> + </span> + <?php } ?> </td> <td class="clickable"> - <label for="<?php echo REQUEST_ID ?>_<?php echo $id ?>" class="label"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="advanced" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $objectid ?>"> - <i class="image-icon image-icon--action-<?php echo $icon ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,40,'..',constant('STR_PAD_BOTH') )))); ?></span> - <span><?php echo nl2br('&nbsp;'); ?></span> + <label class="label"> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </a> </label> </td> </tr> - <?php } ?> - <?php $if4=(($object)==FALSE); if($if4){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if4=(($object)==FALSE); if($if4) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> - <td> - <span><?php echo nl2br('&nbsp;'); ?></span> + <td class=""> + <span class=""> + </span> </td> <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="./#/folder/"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_create'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="/#/folder/" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_create'))) ?> + </span> </a> </td> </tr> </table></div></div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $type= $defaulttype; ?> - <?php foreach($actionlist as $list_key=>$actiontype){ ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php { $type= $defaulttype; ?> + <?php } ?> + <?php foreach($actionlist as $list_key=>$actiontype) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="<?php echo $actiontype ?>"<?php if($actiontype==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" class="label"> - <span><?php echo nl2br('&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FOLDER_SELECT_'.$actiontype.'')))); ?></span> + <input type="radio" name="type" disabled="" value="<?php echo encodeHtml(htmlentities(@$actiontype)) ?>" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${actiontype'))) ?>} + </span> </label> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> </div> <div class="input"> - <span><?php echo nl2br('&nbsp;&nbsp;&nbsp;&nbsp;'); ?></span> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'CONFIRM_DELETE'.'')))); ?></span> + <span class=""> + </span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_SELECT_TARGET_FOLDER'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FOLDER_SELECT_TARGET_FOLDER'))) ?> + </span> </div> <div class="input"> - <div class="selector"> -<div class="inputholder or-droppable"> -<input type="hidden" class="or-selector-link-value" name="targetobjectid" value="<?php echo $rootfolderid ?>" /> -<input type="text" class="or-selector-link-name" value="<?php echo $rootfoldername ?>" placeholder="<?php echo $rootfoldername ?>" /> -</div> -<div class="dropdown"></div> -<div class="tree selector" data-types="{types}" data-init-id="<?php echo $rootfolderid ?>" data-init-folderid="<?php echo $rootfolderid ?>"> -</div> -</div> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/advanced.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/advanced.tpl.src.xml @@ -18,17 +18,17 @@ <list list="object" extract="true"> <row class="data"> <column width="1%"> - <if true="var:writable"> - <checkbox name="var:id"></checkbox> + <if true="${writable}"> + <checkbox name="${id}"></checkbox> </if> <if false="writable"> <text raw="_"></text> </if> </column> <column class="clickable"> - <label for="var:id"> - <link type="open" name="var:name" action="var:type" id="var:objectid"> - <image action="var:icon"></image> + <label for="${id}"> + <link type="open" name="${name}" action="${type}" id="${objectid}"> + <image action="${icon}"></image> <text var="name" maxlength="40"></text> <text raw="_"></text> </link> @@ -56,17 +56,17 @@ </column> </row> </table> - <group title="message:options"> - <set var="type" value="var:defaulttype"></set> + <group title="#{options}"> + <set var="type" value="${defaulttype}"></set> <list list="actionlist" value="actiontype"> <part class="line"> <part class="label"> </part> <part class="input"> - <radio name="type" value="var:actiontype"></radio> - <label for="type" value="var:actiontype"> + <radio name="type" value="${actiontype}"></radio> + <label for="type" value="${actiontype}"> <text raw="_"></text> - <text key="var:actiontype" prefix="FOLDER_SELECT_"></text> + <text key="${actiontype}" prefix="FOLDER_SELECT_"></text> </label> </part> </part> @@ -88,11 +88,11 @@ <text key="FOLDER_SELECT_TARGET_FOLDER" /> </part> <part class="input"> - <selector types="folder" param="targetobjectid" name="var:rootfoldername" - id="var:rootfolderid" folderid="var:rootfolderid" /> + <selector types="folder" param="targetobjectid" name="${rootfoldername}" + id="${rootfolderid}" folderid="${rootfolderid}" /> </part> </part> </group> </form> - <insert script="mark" inline="true"></insert> + <!-- <insert script="mark" inline="true"></insert> --> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/content.php b/modules/cms-ui/themes/default/html/views/folder/content.php @@ -1,74 +1,94 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span><?php echo nl2br('&nbsp;/&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> + <span class=""> / + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + </span> </td> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon_folder.png" /> - <span><?php echo nl2br('..'); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon_folder.png" class=""> + </img> + <span class="">.. + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php } ?> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td title="<?php echo $desc ?>" data-name="<?php echo $name ?>" data-action="<?php echo $type ?>" data-id="<?php echo $id ?>" class="clickable <?php echo $class ?>"> - <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span><?php echo nl2br('&nbsp;'); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable <?php echo encodeHtml(htmlentities(@$class)) ?>"> + <img src="./modules/cms-ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$icon)) ?>.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if3=(($object)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfolder'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="view" data-action="folder" data-method="createfolder" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createfolder'))) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createpage'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="view" data-action="folder" data-method="createpage" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createpage'))) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfile'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="view" data-action="folder" data-method="createfile" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createfile'))) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="modal" data-action="folder" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createlink'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="modal" data-action="folder" data-method="createlink" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createlink'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/folder/content.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/content.tpl.src.xml @@ -13,7 +13,7 @@ </row> <if present="up_url"> <row class="data"> - <column url="var:up_url"> + <column url="${up_url}"> <image type="folder"></image> <text raw=".."></text> </column> @@ -24,13 +24,13 @@ </if> <list list="object" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class"> - <image type="var:icon"></image> + <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> + <image type="${icon}"></image> <text var="name"></text> <text raw="_"></text> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/create.php b/modules/cms-ui/themes/default/html/views/folder/create.php @@ -1,52 +1,59 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="or-linklist"> - <?php $if3=($mayCreateFolder); if($if3){?> + <?php $if3=($mayCreateFolder); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfolder'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createfolder'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreatePage); if($if3){?> + <?php } ?> + <?php $if3=($mayCreatePage); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createpage'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createpage'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateFile); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateFile); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfile'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createfile'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateImage); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateImage); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createimage'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createimage'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateText); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateText); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createtext'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createtext'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateUrl); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateUrl); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createurl'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createurl'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateLink); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateLink); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createlink'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createlink'))) ?> + </span> </a> </div> - <?php } ?> + <?php } ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/create.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/create.tpl.src.xml @@ -3,7 +3,7 @@ <part class="or-linklist"> - <if true="var:mayCreateFolder"> + <if true="${mayCreateFolder}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createfolder"> <text key="menu_createfolder"></text> @@ -11,7 +11,7 @@ </part> </if> - <if true="var:mayCreatePage"> + <if true="${mayCreatePage}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createpage"> <text key="menu_createpage"></text> @@ -19,7 +19,7 @@ </part> </if> - <if true="var:mayCreateFile"> + <if true="${mayCreateFile}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createfile"> <text key="menu_createfile"></text> @@ -27,7 +27,7 @@ </part> </if> - <if true="var:mayCreateImage"> + <if true="${mayCreateImage}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createimage"> <text key="menu_createimage"></text> @@ -35,7 +35,7 @@ </part> </if> - <if true="var:mayCreateText"> + <if true="${mayCreateText}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createtext"> <text key="menu_createtext"></text> @@ -43,7 +43,7 @@ </part> </if> - <if true="var:mayCreateUrl"> + <if true="${mayCreateUrl}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createurl"> <text key="menu_createurl"></text> @@ -51,7 +51,7 @@ </part> </if> - <if true="var:mayCreateLink"> + <if true="${mayCreateLink}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createlink"> <text key="menu_createlink"></text> diff --git a/modules/cms-ui/themes/default/html/views/folder/createfile.php b/modules/cms-ui/themes/default/html/views/folder/createfile.php @@ -1,14 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="upload" action="./" data-method="createfile" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createfile" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="type" value="file"/> + <form name="" target="_self" data-target="upload" action="./" data-method="createfile" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" data-async="" data-autosave="" class="or-form folder"> + <input type="hidden" name="type" value="file" class=""> + </input> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FILE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + </span> </label> </div> <div class="input"> - <input size="40" id="req0_file" type="file" maxlength="<?php echo $maxlength ?>" name="file" class="upload" multiple="multiple" /> + <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload"> + </input> </div> </div> <div class="line or-dropzone-upload"> @@ -19,36 +22,44 @@ </div> <div class="line"> <div class="label"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_max_size'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($max_size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$max_size)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'HTTP_URL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('description') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createfile.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/createfile.tpl.src.xml @@ -10,7 +10,7 @@ </label> </part> <part class="input"> - <upload name="file" maxlength="var:maxlength" multiple="true"></upload> + <upload name="file" maxlength="${maxlength}" multiple="true"></upload> </part> </part> @@ -38,7 +38,7 @@ <input name="url" size="50"></input> </part> </part> - <group title="message:description"></group> + <group title="#{description}"></group> <part class="line"> diff --git a/modules/cms-ui/themes/default/html/views/folder/createfolder.php b/modules/cms-ui/themes/default/html/views/folder/createfolder.php @@ -1,20 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createfolder" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createfolder" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> + <form name="" target="_self" data-target="view" action="./" data-method="createfolder" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FOLDER')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FOLDER'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php '' ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('add') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createfolder.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/createfolder.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <header back="true"></header> - <form visible="true" label="message:add"> + <form visible="true" label="#{add}"> <hidden name="languageid" /> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/folder/createimage.php b/modules/cms-ui/themes/default/html/views/folder/createimage.php @@ -1,14 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="upload" action="./" data-method="createimage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createimage" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="type" value="file"/> + <form name="" target="_self" data-target="upload" action="./" data-method="createimage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" data-async="" data-autosave="" class="or-form folder"> + <input type="hidden" name="type" value="file" class=""> + </input> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FILE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + </span> </label> </div> <div class="input"> - <input size="40" id="req0_file" type="file" maxlength="<?php echo $maxlength ?>" name="file" class="upload" multiple="multiple" /> + <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload"> + </input> </div> </div> <div class="line or-dropzone-upload"> @@ -19,36 +22,44 @@ </div> <div class="line"> <div class="label"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_max_size'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($max_size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$max_size)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'HTTP_URL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('description') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createimage.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/createimage.tpl.src.xml @@ -10,7 +10,7 @@ </label> </part> <part class="input"> - <upload name="file" maxlength="var:maxlength" multiple="true"></upload> + <upload name="file" maxlength="${maxlength}" multiple="true"></upload> </part> </part> @@ -38,7 +38,7 @@ <input name="url" size="50"></input> </part> </part> - <group title="message:description"></group> + <group title="#{description}"></group> <part class="line"> diff --git a/modules/cms-ui/themes/default/html/views/folder/createlink.php b/modules/cms-ui/themes/default/html/views/folder/createlink.php @@ -1,11 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createlink" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createlink" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createlink" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php '' ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> @@ -16,10 +18,12 @@ </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createpage.php b/modules/cms-ui/themes/default/html/views/folder/createpage.php @@ -1,28 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createpage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createpage" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createpage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_TEMPLATE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_TEMPLATE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_templateid" name="templateid" title="" class=""<?php if (count($templates)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($templates,'',0,0) ?><?php if (count($templates)==0) { ?><input type="hidden" name="templateid" value="" /><?php } ?><?php if (count($templates)==1) { ?><input type="hidden" name="templateid" value="<?php echo array_keys($templates)[0] ?>" /><?php } ?> - </select></div> + <input name="templateid" value="" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus,name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus,name"> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createtext.php b/modules/cms-ui/themes/default/html/views/folder/createtext.php @@ -1,13 +1,15 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createtext" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createtext" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createtext" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FILE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + </span> </label> </div> <div class="input"> - <input size="40" id="req0_file" type="file" maxlength="<?php echo $maxlength ?>" name="file" class="upload" multiple="multiple" /> + <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload"> + </input> </div> </div> <div class="line or-dropzone-upload"> @@ -18,36 +20,44 @@ </div> <div class="line"> <div class="label"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_max_size'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($max_size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$max_size)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'HTTP_URL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('description') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createtext.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/createtext.tpl.src.xml @@ -9,7 +9,7 @@ </label> </part> <part class="input"> - <upload name="file" maxlength="var:maxlength" multiple="true"></upload> + <upload name="file" maxlength="${maxlength}" multiple="true"></upload> </part> </part> @@ -37,7 +37,7 @@ <input name="url" size="50"></input> </part> </part> - <group title="message:description"></group> + <group title="#{description}"></group> <part class="line"> diff --git a/modules/cms-ui/themes/default/html/views/folder/createurl.php b/modules/cms-ui/themes/default/html/views/folder/createurl.php @@ -1,19 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createurl" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createurl" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createurl" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('URL')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php '' ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php '' ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> @@ -24,10 +28,12 @@ </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.php b/modules/cms-ui/themes/default/html/views/folder/edit.php @@ -1,56 +1,69 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TYPE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LASTCHANGE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LASTCHANGE'))) ?> + </span> </th> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data clickable"> - <td> - <a target="_self" date-name="" name="" data-type="open" data-action="folder" data-method="edit" data-id="<?php echo $parentid ?>" data-extra="[]" href="./#/folder/<?php echo $parentid ?>"> - <i class="image-icon image-icon--action-folder"></i> - <span><?php echo nl2br(encodeHtml(htmlentities('..'))); ?></span> + <td class=""> + <a target="_self" data-type="open" data-action="folder" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$parentid)) ?>" data-extra="[]" href="/#/folder/<?php echo encodeHtml(htmlentities(@$parentid)) ?>" class=""> + <i class="image-icon image-icon--action-folder"> + </i> + <span class="">.. + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php } ?> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data clickable"> - <td> - <i class="image-icon image-icon--action-<?php echo $icon ?>"></i> + <td class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + </i> </td> - <td> - <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span><?php echo nl2br('&nbsp;'); ?></span> + <td class=""> + <a title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </a> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if3=(($object)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> <div class="clickable"> - <a class="or-link-btn" target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="./#/folder/"> - <i class="image-icon image-icon--action-new"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="/#/folder/" class="or-link-btn"> + <i class="image-icon image-icon--action-new"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </div> \ No newline at end of file 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 @@ -15,7 +15,7 @@ <if present="up_url"> <row class="data clickable"> <column> - <link type="open" id="var:parentid" name="" action="folder"> + <link type="open" id="${parentid}" name="" action="folder"> <image action="folder"></image> <text value=".." /> </link> @@ -28,16 +28,16 @@ <list list="object" extract="true"> <row class="data clickable"> <column class=""> - <image action="var:icon"></image> + <image action="${icon}"></image> </column> <column class=""> - <link type="open" id="var:id" name="var:name" action="var:type" title="var:desc"> + <link type="open" id="${id}" name="${name}" action="${type}" title="${desc}"> <text var="name"></text> <text raw="_"></text> </link> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/inherit.php b/modules/cms-ui/themes/default/html/views/folder/inherit.php @@ -1,18 +1,21 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="inherit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($type=='folder'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <?php $if3=($type=='folder'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $inherit= '1'; ?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_inherit" name="<?php if ('') echo ''.'_' ?>inherit<?php if (false) echo '_disabled' ?>" type="checkbox" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$inherit) ?>" /><?php if (false) { ?><input type="hidden" name="inherit" value="<?php $inherit ?>"/><?php } ?></div> - <label for="<?php echo REQUEST_ID ?>_inherit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'inherit_rights'.'')))); ?></span> + <?php { $inherit= '1'; ?> + <?php } ?> + <input name="inherit" disabled="" type="checkbox" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/inherit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/inherit.tpl.src.xml @@ -3,8 +3,8 @@ <header back="true" /> <form> - <if value="var:type" equals="folder"> - <group title="message:options"> + <if value="${type}" equals="folder"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/folder/order.php b/modules/cms-ui/themes/default/html/views/folder/order.php @@ -1,43 +1,55 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="order" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="order" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table class="or-table--sortable" width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="order" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class="or-table--sortable"> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_ORDER'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FOLDER_ORDER'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_FILENAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_FILENAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + </span> </td> </tr> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr class="data" data-id="<?php echo $id ?>"> - <td> - <span><?php echo nl2br('&nbsp;'); ?></span> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> + <tr data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="data"> + <td class=""> + <span class=""> + </span> </td> - <td> - <span class="sort-value"><?php echo nl2br(encodeHtml(htmlentities($icon))); ?></span> - <i class="image-icon image-icon--action-<?php echo $icon ?>"></i> + <td class=""> + <span class="sort-value"><?php echo encodeHtml(htmlentities(@$icon)) ?> + </span> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + </i> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <input type="hidden" name="order" value=""/> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <input type="hidden" name="order" value="<?php echo encodeHtml(htmlentities(@$order)) ?>" class=""> + </input> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/order.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/order.tpl.src.xml @@ -21,13 +21,13 @@ </column> </row> <list list="object" extract="true"> - <row class="data" id="var:id"> + <row class="data" id="${id}"> <column> <text raw="_"></text> </column> <column> - <text class="sort-value" value="var:icon" /> - <image action="var:icon"></image> + <text class="sort-value" value="${icon}" /> + <image action="${icon}"></image> </column> <column> <text var="name"></text> @@ -36,7 +36,7 @@ <text var="filename"></text> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.php b/modules/cms-ui/themes/default/html/views/folder/pub.php @@ -1,110 +1,75 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($pages); if($if3){?> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form folder"> + <?php $if3=($pages); if($if3) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'pages';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span><?php echo nl2br('&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_pages')))); ?></span> + <input type="checkbox" name="pages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$pages)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_pages'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if3=($files); if($if3){?> + <?php } ?> + <?php $if3=($files); if($if3) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'files';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_files" class="label"> - <span><?php echo nl2br('&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span> + <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> + </span> </label> </div> </div> - <?php } ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $if4=(isset($subdirs)); if($if4){?> + <?php } ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if4=(isset($subdirs)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'subdirs';$default = false;$readonly = $subdirs;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_subdirs" class="label"> - <span><?php echo nl2br('&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_PUBLISH_WITH_SUBDIRS')))); ?></span> + <input type="checkbox" name="subdirs" disabled="<?php echo encodeHtml(htmlentities(@$subdirs)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$subdirs)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_PUBLISH_WITH_SUBDIRS'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($clean)); if($if4){?> + <?php } ?> + <?php $if4=(isset($clean)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'clean';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_clean" class="label"> - <span><?php echo nl2br('&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_CLEAN_AFTER_PUBLISH')))); ?></span> + <input type="checkbox" name="clean" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$clean)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_CLEAN_AFTER_PUBLISH'))) ?> + </span> </label> </div> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/pub.tpl.src.xml @@ -4,15 +4,15 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="false" visible="true" label="message:publish" async="true"> - <if true="var:pages"> + <form cancel="false" visible="true" label="#{publish}" async="true"> + <if true="${pages}"> <part class="line"> <part class="label"> @@ -26,7 +26,7 @@ </part> </part> </if> - <if true="var:files"> + <if true="${files}"> <part class="line"> <part class="label"> </part> @@ -40,13 +40,13 @@ </part> </if> - <group title="message:options"> + <group title="#{options}"> <if present="subdirs"> <part class="line"> <part class="label"> </part> <part class="input"> - <checkbox readonly="var:subdirs" name="subdirs"></checkbox> + <checkbox readonly="${subdirs}" name="subdirs"></checkbox> <label for="subdirs"> <text raw="_"></text> <text text="GLOBAL_PUBLISH_WITH_SUBDIRS"></text> diff --git a/modules/cms-ui/themes/default/html/views/folder/remove.php b/modules/cms-ui/themes/default/html/views/folder/remove.php @@ -1,30 +1,9 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?>&nbsp;?GLOBAL_DELETE? </span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'withChildren';$default = false;$readonly = !$hasChildren;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?>&nbsp;?GLOBAL_DELETE_WITH_CHILDREN? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="withChildren" disabled="not:var:hasChildren" value="1" checked="<?php echo encodeHtml(htmlentities(@$withChildren)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/show.php b/modules/cms-ui/themes/default/html/views/folder/show.php @@ -1,52 +1,65 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TYPE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LASTCHANGE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LASTCHANGE'))) ?> + </span> </th> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data clickable"> - <td> - <i class="image-icon image-icon--action-folder"></i> + <td class=""> + <i class="image-icon image-icon--action-folder"> + </i> </td> - <td> - <span><?php echo nl2br('..'); ?></span> + <td class=""> + <span class="">.. + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php } ?> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td title="<?php echo $desc ?>" data-name="<?php echo $name ?>" data-action="<?php echo $type ?>" data-id="<?php echo $id ?>" class="clickable <?php echo $class ?>"> - <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span><?php echo nl2br('&nbsp;'); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable <?php echo encodeHtml(htmlentities(@$class)) ?>"> + <img src="./modules/cms-ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$icon)) ?>.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if3=(($object)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> <div class="clickable"> - <a class="or-link-btn" target="_self" data-type="view" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <i class="image-icon image-icon--action-new"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <a target="_self" data-type="view" data-action="folder" data-method="create" data-id="" data-extra="[]" href="/#/folder/" class="or-link-btn"> + <i class="image-icon image-icon--action-new"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml @@ -17,7 +17,7 @@ <column> <image action="folder" /> </column> - <column url="var:up_url"> + <column url="${up_url}"> <text raw=".."></text> </column> <column> @@ -27,13 +27,13 @@ </if> <list list="object" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class"> - <image type="var:icon"></image> + <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> + <image type="${icon}"></image> <text var="name"></text> <text raw="_"></text> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/structure.php b/modules/cms-ui/themes/default/html/views/folder/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/structure.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/add.php b/modules/cms-ui/themes/default/html/views/group/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('name') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('name'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/info.php b/modules/cms-ui/themes/default/html/views/group/info.php @@ -1,39 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <a class="or-link-btn" target="_self" data-type="edit" data-action="group" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/group/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <a target="_self" data-type="edit" data-action="group" data-method="prop" data-id="" data-extra="[]" href="/#/group/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USERS')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USERS'))) ?> + </span> </div> <div class="input"> - <?php foreach($users as $id=>$name){ ?> + <?php foreach($users as $id=>$name) { ?> <div class="clickable"> - <a target="_self" data-type="open" data-action="user" data-method="info" data-id="<?php echo $id ?>" data-extra="[]" href="./#/user/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-type="open" data-action="user" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/user/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> - <br/> + <br> + </br> </div> - <?php } ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="edit" data-action="group" data-method="memberships" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/group/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="edit" data-action="group" data-method="memberships" data-id="" data-extra="[]" href="/#/group/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/info.tpl.src.xml @@ -24,7 +24,7 @@ <list list="users" key="id" value="name"> <part class="clickable"> - <link type="open" action="user" id="var:id"> + <link type="open" action="user" id="${id}"> <text var="name"/> </link> <newline/> diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.php b/modules/cms-ui/themes/default/html/views/group/memberships.php @@ -1,45 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="true"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="memberships" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="1" class="or-form group"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td width="10%"> + <td width="10%" class=""> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($memberships as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <?php { $tmpname = $var;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$var)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${var)) ?>}" class=""> + </input> </td> - <td> - <label for="<?php echo REQUEST_ID ?>_<?php echo $var ?>" class="label"> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <label class="label"> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </label> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml @@ -11,10 +11,10 @@ <list list="memberships" extract="true"> <row class="data"> <column> - <checkbox name="var:var"></checkbox> + <checkbox name="${var}"></checkbox> </column> <column> - <label for="var:var"> + <label for="${var}"> <image action="user"></image> <text var="name"></text> </label> diff --git a/modules/cms-ui/themes/default/html/views/group/prop.php b/modules/cms-ui/themes/default/html/views/group/prop.php @@ -1,13 +1,15 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="group" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="group" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="100" class="name focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/remove.php b/modules/cms-ui/themes/default/html/views/group/remove.php @@ -1,35 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> <div class="line"> <div class="label"> - <label class="label"><?php echo lang('GLOBAL_NAME') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"><?php echo lang('GROUP_DELETE') ?> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GROUP_DELETE'))) ?> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/remove.tpl.src.xml @@ -10,7 +10,7 @@ <text var="name"></text> </part> </part> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"></part> <part class="input"> diff --git a/modules/cms-ui/themes/default/html/views/group/rights.php b/modules/cms-ui/themes/default/html/views/group/rights.php @@ -1,83 +1,87 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> - <?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr> - <td> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $projectname ?></legend><div class="closable"> - <?php $if7=(($rights)==FALSE); if($if7){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($projects as $list_key=>$list_value) { extract($list_value); ?> + <tr class=""> + <td class=""> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if7=(($rights)==FALSE); if($if7) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php $if7=!(($rights)==FALSE); if($if7){?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <?php } ?> + <?php $if7=!(($rights)==FALSE); if($if7) { ?> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> + <?php foreach($show as $list_key=>$t) { ?> <td class="help"> - <span title="<?php echo lang('acl_'.$t.'') ?>"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span> + <span title="message:acl<?php echo encodeHtml(htmlentities()) ?>" class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </td> - <?php } ?> + <?php } ?> </tr> - <?php foreach($rights as $aclid=>$acl){ ?><?php extract($acl) ?> + <?php foreach($rights as $aclid=>$acl) { extract($acl); ?> <tr class="data clickable"> - <td> - <?php $if12=(isset($groupname)); if($if12){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $groupname,20,'..',constant('STR_PAD_BOTH') )))); ?></span> - <?php } ?> - <?php $if12=!(isset($username)); if($if12){?> - <?php $if13=!(isset($groupname)); if($if13){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span> - <?php } ?> - <?php } ?> - <?php unset($username) ?> - <?php unset($groupname) ?> + <td class=""> + <?php $if12=(isset($groupname)); if($if12) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$groupname)) ?> + </span> + <?php } ?> + <?php $if12=!(isset($username)); if($if12) { ?> + <?php $if13=!(isset($groupname)); if($if13) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_all'))) ?> + </span> + <?php } ?> + <?php } ?> + <?php { unset($username) ?> + <?php } ?> + <?php { unset($groupname) ?> + <?php } ?> </td> - <td title="<?php echo $objectname ?>"> - <i class="image-icon image-icon--action-<?php echo $objecttype ?>"></i> - <a target="_self" data-type="open" data-action="<?php echo $objecttype ?>" data-method="" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $objecttype ?>/<?php echo $objectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectname))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$objectname)) ?>" class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$objecttype)) ?>"> + </i> + <a target="_self" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$objecttype)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$objecttype)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$objectname)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $languagename,20,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> - <?php foreach($show as $list_key=>$list_value){ ?> - <td> - <?php $$list_value= $bits[$list_value]; ?> - <?php { $tmpname = $list_value;$default = false;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php foreach($show as $list_key=>$list_value) { ?> + <td class=""> + <?php { $$list_value= $bits[$list_value]; ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${list_value)) ?>}" class=""> + </input> </td> - <?php } ?> + <?php } ?> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php } ?> + <?php } ?> </div></fieldset> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml @@ -4,7 +4,7 @@ <list list="projects" extract="true"> <row> <column> - <group title="var:projectname"> + <group title="${projectname}"> <if empty="rights"> <row> <column> @@ -26,7 +26,7 @@ </column> <list list="show" value="t"> <column class="help"> - <text key="var:t" prefix="acl_" suffix="_abbrev" + <text key="${t}" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text> </column> </list> @@ -47,9 +47,9 @@ <set var="username"></set> <set var="groupname"></set> </column> - <column title="var:objectname"> - <image action="var:objecttype"></image> - <link type="open" action="var:objecttype" subaction="" id="var:objectid"> + <column title="${objectname}"> + <image action="${objecttype}"></image> + <link type="open" action="${objecttype}" subaction="" id="${objectid}"> <text var="objectname"></text> </link> </column> @@ -58,8 +58,8 @@ </column> <list list="show"> <column> - <set var="var:list_value" value="var:bits" key="var:list_value"></set> - <checkbox name="var:list_value" readonly="true"></checkbox> + <set var="${list_value}" value="${bits}" key="${list_value}"></set> + <checkbox name="${list_value}" readonly="true"></checkbox> </column> </list> </row> diff --git a/modules/cms-ui/themes/default/html/views/grouplist/add.php b/modules/cms-ui/themes/default/html/views/grouplist/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="grouplist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form grouplist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="grouplist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="grouplist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form grouplist"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('name') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('name'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/grouplist/show.php b/modules/cms-ui/themes/default/html/views/grouplist/show.php @@ -1,25 +1,30 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td data-name="<?php echo $name ?>" data-action="group" data-id="<?php echo $id ?>" class="clickable clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="group" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/group/<?php echo $id ?>"> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="group" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable clickable"> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="group" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/group/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="2" class="clickable"> - <a target="_self" date-name="<?php echo lang('menu_add') ?>" name="<?php echo lang('menu_add') ?>" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('menu_add'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('menu_add'))) ?>" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> 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 @@ -9,8 +9,8 @@ </row> <list list="el" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="group" class="clickable"> - <link type="open" id="var:id" name="var:name" action="group"> + <column id="${id}" name="${name}" action="group" class="clickable"> + <link type="open" id="${id}" name="${name}" action="group"> <image action="group"></image> <text var="name" maxlength="30"></text> </link> @@ -20,7 +20,7 @@ </list> <row class="data"> <column colspan="2" class="clickable"> - <link type="dialog" subaction="add" name="message:menu_add"> + <link type="dialog" subaction="add" name="#{menu_add}"> <image method="add"/> <text text="new"/> </link> diff --git a/modules/cms-ui/themes/default/html/views/image/compress.php b/modules/cms-ui/themes/default/html/views/image/compress.php @@ -1,25 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="compress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPTIONS') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </div> <div class="input"> - <?php $gz= 'gz'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,'gz',0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $gz= 'gz'; ?> + <?php } ?> + <input name="format" value="gz" size="1" class=""> + </input> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/compress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/compress.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:OPTIONS"> + <group title="#{OPTIONS}"> <part class="line"> <part class="label"> <text text="type"></text> diff --git a/modules/cms-ui/themes/default/html/views/image/edit.php b/modules/cms-ui/themes/default/html/views/image/edit.php @@ -1,13 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> <div class="line"> <div class="label"> </div> <div class="input"> - <br/> - <input size="40" id="req0_file" type="file" name="file" class="upload" /> - <br/> - <br/> + <br> + </br> + <input id="req0_file" name="file" size="40" class="upload"> + </input> + <br> + </br> + <br> + </br> </div> </div> <div class="line or-dropzone-upload"> @@ -16,4 +20,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/extract.php b/modules/cms-ui/themes/default/html/views/image/extract.php @@ -1,11 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extract" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/preview.php b/modules/cms-ui/themes/default/html/views/image/preview.php @@ -1,2 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <iframe src="<?php echo $preview_url ?>"></iframe>- \ No newline at end of file + <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/preview.tpl.src.xml @@ -1,5 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <insert url="var:preview_url"></insert> + <insert url="${preview_url}"></insert> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/pub.php b/modules/cms-ui/themes/default/html/views/image/pub.php @@ -1,21 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <br/> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form image"> + <tr class=""> + <td class=""> + <br> + </br> </td> </tr> - <tr> + <tr class=""> <td class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="false" visible="true" label="message:publish" async="true"> + <form cancel="false" visible="true" label="#{publish}" async="true"> <row> <column> <newline></newline> diff --git a/modules/cms-ui/themes/default/html/views/image/remove.php b/modules/cms-ui/themes/default/html/views/image/remove.php @@ -1,39 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DELETE')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DELETE'))) ?> + </span> </td> - <td> - <?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input> </td> </tr> - <tr> - <td colspan="2"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> + <tr class=""> + <td colspan="2" class=""> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/show.php b/modules/cms-ui/themes/default/html/views/image/show.php @@ -1,14 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <tr> - <td colspan="2"> - <iframe src="<?php echo $preview_url ?>"></iframe> - <a class="action" target="_self" data-action="file" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/edit.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_edit'.'')))); ?></span> + <tr class=""> + <td colspan="2" class=""> + <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe> + <a target="_self" data-action="file" data-method="edit" data-id="" data-extra="[]" href="/#/file/" class="action"> + <img src="./modules/cms-ui/themes/default/images/icon/icon/edit.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_edit'))) ?> + </span> </a> - <a class="action" target="_self" data-action="file" data-method="editvalue" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/editvalue.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_editvalue'.'')))); ?></span> + <a target="_self" data-action="file" data-method="editvalue" data-id="" data-extra="[]" href="/#/file/" class="action"> + <img src="./modules/cms-ui/themes/default/images/icon/icon/editvalue.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_editvalue'))) ?> + </span> </a> </td> </tr> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/show.tpl.src.xml @@ -5,7 +5,7 @@ <window icon="folder"> <row> <column colspan="2"> - <insert url="var:preview_url"></insert> + <insert url="${preview_url}"></insert> <link class="action" action="file" subaction="edit"> <image file="icon/edit"></image> <text key="menu_file_edit"></text> diff --git a/modules/cms-ui/themes/default/html/views/image/size.php b/modules/cms-ui/themes/default/html/views/image/size.php @@ -1,94 +1,99 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="size" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('IMAGE_OLD_SIZE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('IMAGE_OLD_SIZE'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($width))); ?></span> - <span><?php echo nl2br('&nbsp;*&nbsp;'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($height))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$width)) ?> + </span> + <span class=""> * + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$height)) ?> + </span> </div> </div> - <?php $if3=!(($formats)==FALSE); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('IMAGE_NEW_SIZE') ?></legend><div class="closable"> + <?php $if3=!(($formats)==FALSE); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_factor" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="factor"<?php if('factor'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_factor" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_SIZE_FACTOR')))); ?></span> + <input type="radio" name="type" disabled="" value="factor" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_SIZE_FACTOR'))) ?> + </span> </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_factor" name="factor" title="" class=""<?php if (count($factors)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($factors,$factor,0,0) ?><?php if (count($factors)==0) { ?><input type="hidden" name="factor" value="" /><?php } ?><?php if (count($factors)==1) { ?><input type="hidden" name="factor" value="<?php echo array_keys($factors)[0] ?>" /><?php } ?> - </select></div> - <?php $factor= '1'; ?> + <input name="factor" value="<?php echo encodeHtml(htmlentities(@$factor)) ?>" size="1" class=""> + </input> + <?php { $factor= '1'; ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_input" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="input"<?php if('input'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_input" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_NEW_WIDTH_HEIGHT')))); ?></span> + <input type="radio" name="type" disabled="" value="input" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_NEW_WIDTH_HEIGHT'))) ?> + </span> </label> </div> <div class="label"> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> - <span><?php echo nl2br('&nbsp;*&nbsp;'); ?></span> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> + <span class=""> * + </span> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_format" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_FORMAT')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_FORMAT'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,$format,0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> + <input name="format" value="<?php echo encodeHtml(htmlentities(@$format)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_jpeglist_compression" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_JPEG_COMPRESSION')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_JPEG_COMPRESSION'))) ?> + </span> </label> </div> <div class="input"> - <?php $jpeg_compression= '70'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_jpeg_compression" name="jpeg_compression" title="" class=""<?php if (count($jpeglist)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($jpeglist,$jpeg_compression,0,0) ?><?php if (count($jpeglist)==0) { ?><input type="hidden" name="jpeg_compression" value="" /><?php } ?><?php if (count($jpeglist)==1) { ?><input type="hidden" name="jpeg_compression" value="<?php echo array_keys($jpeglist)[0] ?>" /><?php } ?> - </select></div> + <?php { $jpeg_compression= '70'; ?> + <?php } ?> + <input name="jpeg_compression" value="<?php echo encodeHtml(htmlentities(@$jpeg_compression)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'copy';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_copy" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> + <input type="checkbox" name="copy" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$copy)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/size.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/size.tpl.src.xml @@ -12,7 +12,7 @@ </part> </part> <if not="" empty="formats"> - <group title="message:IMAGE_NEW_SIZE"> + <group title="#{IMAGE_NEW_SIZE}"> <part class="line"> <part class="label"></part> @@ -44,7 +44,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> <label for="format"> diff --git a/modules/cms-ui/themes/default/html/views/image/structure.php b/modules/cms-ui/themes/default/html/views/image/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/structure.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/uncompress.php b/modules/cms-ui/themes/default/html/views/image/uncompress.php @@ -1,21 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="uncompress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/uncompress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/image/value.php b/modules/cms-ui/themes/default/html/views/image/value.php @@ -1,19 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> - <td> - <textarea name="<?php if ('') echo ''.'_' ?>value<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'value'}) ?></textarea> + <td class=""> + <textarea name="value" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/add.php b/modules/cms-ui/themes/default/html/views/language/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_isocode" name="isocode" title="" class=""<?php if (count($isocodes)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($isocodes,$isocode,0,0) ?><?php if (count($isocodes)==0) { ?><input type="hidden" name="isocode" value="" /><?php } ?><?php if (count($isocodes)==1) { ?><input type="hidden" name="isocode" value="<?php echo array_keys($isocodes)[0] ?>" /><?php } ?> - </select></div> + <input name="isocode" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/info.php b/modules/cms-ui/themes/default/html/views/language/info.php @@ -1,29 +1,35 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="language" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="language" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input clickable"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($isocode))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$isocode)) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="edit" data-action="language" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/language/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="edit" data-action="language" data-method="prop" data-id="" data-extra="[]" href="/#/language/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/listing.php b/modules/cms-ui/themes/default/html/views/language/listing.php @@ -1,46 +1,59 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon/icon_language.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon_language.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($isocode))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$isocode)) ?> + </span> </td> - <td> - <?php $if8=(isset($default_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($default_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </span> + <?php } ?> </td> - <td> - <?php $if8=(isset($select_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_select')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_selected')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($select_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_select'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_selected'))) ?> + </span> + <?php } ?> </td> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/listing.tpl.src.xml b/modules/cms-ui/themes/default/html/views/language/listing.tpl.src.xml @@ -1,3 +1,3 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="language"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><image file="icon_language"></image><text var="name" maxlength="25"></text></column><column><text var="isocode"></text></column><column url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="language"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="${url}"><image file="icon_language"></image><text var="name" maxlength="25"></text></column><column><text var="isocode"></text></column><column url="${default_url}"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="${select_url}"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/prop.php b/modules/cms-ui/themes/default/html/views/language/prop.php @@ -1,40 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="50" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_isocode" name="<?php if ('') echo ''.'_' ?>isocode<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$isocode) ?>" /><?php if (false) { ?><input type="hidden" name="isocode" value="<?php $isocode ?>"/><?php } ?></div> + <input name="isocode" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'is_default';$default = false;$readonly = $is_default;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_is_default" class="label"><?php echo lang('GLOBAL_is_default') ?> + <input type="checkbox" name="is_default" disabled="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/language/prop.tpl.src.xml @@ -26,7 +26,7 @@ <part class="label"> </part> <part class="input"> - <checkbox name="is_default" readonly="var:is_default"></checkbox> + <checkbox name="is_default" readonly="${is_default}"></checkbox> <label key="GLOBAL_is_default" for="is_default" /> </part> </part> diff --git a/modules/cms-ui/themes/default/html/views/language/remove.php b/modules/cms-ui/themes/default/html/views/language/remove.php @@ -1,37 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/language/remove.tpl.src.xml @@ -13,7 +13,7 @@ </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/language/structure.php b/modules/cms-ui/themes/default/html/views/language/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/language/structure.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/languagelist/add.php b/modules/cms-ui/themes/default/html/views/languagelist/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="languagelist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form languagelist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="languagelist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="languagelist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form languagelist"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_isocode" name="isocode" title="" class=""<?php if (count($isocodes)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($isocodes,$isocode,0,0) ?><?php if (count($isocodes)==0) { ?><input type="hidden" name="isocode" value="" /><?php } ?><?php if (count($isocodes)==1) { ?><input type="hidden" name="isocode" value="<?php echo array_keys($isocodes)[0] ?>" /><?php } ?> - </select></div> + <input name="isocode" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/languagelist/show.php b/modules/cms-ui/themes/default/html/views/languagelist/show.php @@ -1,52 +1,64 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LANGUAGE_ISOCODE'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <i class="image-icon image-icon--action-language"></i> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="language" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/language/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <i class="image-icon image-icon--action-language"> + </i> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="language" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/language/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($isocode))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$isocode)) ?> + </span> </td> - <?php $if5=(!$is_default); if($if5){?> + <?php $if5=(!$is_default); if($if5) { ?> <td class="clickable"> - <?php $if7=(isset($id)); if($if7){?> - <a target="_self" data-type="post" data-action="language" data-method="setdefault" data-id="<?php echo $id ?>" data-extra="[]" data-data="{&quot;action&quot;:&quot;language&quot;,&quot;subaction&quot;:&quot;setdefault&quot;,&quot;id&quot;:&quot;<?php echo $id ?>&quot;,&quot;token&quot;:&quot;<?php echo token() ?>&quot;,&quot;none&quot;:&quot;0&quot;}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> + <?php $if7=(isset($id)); if($if7) { ?> + <a target="_self" data-type="post" data-action="language" data-method="setdefault" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" data-data="{"action":"language","subaction":"setdefault","id":"<?php echo encodeHtml(htmlentities(@$id)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> </a> - <?php } ?> - <?php if(!$if7){?> - <?php } ?> + <?php } ?> + <?php if(!$if7) { ?> + <?php } ?> </td> - <?php } ?> - <?php if(!$if5){?> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></em> + <?php } ?> + <?php if(!$if5) { ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </em> </td> - <?php } ?> + <?php } ?> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> <tr class="data"> <td colspan="3" class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/languagelist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/languagelist/show.tpl.src.xml @@ -16,18 +16,18 @@ <row class="data"> <column class="clickable"> <image action="language"></image> - <link type="open" name="var:name" action="language" id="var:id"> + <link type="open" name="${name}" action="language" id="${id}"> <text var="name" maxlength="25"></text> </link> </column> <column> <text var="isocode"></text> </column> - <if false="var:is_default"> + <if false="${is_default}"> <column class="clickable"> <if present="id"> - <link type="post" action="language" subaction="setdefault" id="var:id"> + <link type="post" action="language" subaction="setdefault" id="${id}"> <text text="GLOBAL_make_default"></text> </link> </if> diff --git a/modules/cms-ui/themes/default/html/views/link/edit.php b/modules/cms-ui/themes/default/html/views/link/edit.php @@ -1,21 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="link" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form link"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_target')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('link_target'))) ?> + </span> </div> <div class="input"> - <div class="selector"> -<div class="inputholder or-droppable"> -<input type="hidden" class="or-selector-link-value" name="targetobjectid" value="<?php echo $targetobjectid ?>" /> -<input type="text" class="or-selector-link-name" value="<?php echo $targetobjectname ?>" placeholder="<?php echo $targetobjectname ?>" /> -</div> -<div class="dropdown"></div> -<div class="tree selector" data-types="{types}" data-init-id="<?php echo $targetobjectid ?>" data-init-folderid="parentid"> -</div> -</div> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/link/edit.tpl.src.xml @@ -7,7 +7,7 @@ <text text="link_target"></text> </part> <part class="input"> - <selector id="var:targetobjectid" name="var:targetobjectname" types="page,file" param="targetobjectid" folderid="parentid"/> + <selector id="${targetobjectid}" name="${targetobjectname}" types="page,file" param="targetobjectid" folderid="parentid"/> </part> </part> diff --git a/modules/cms-ui/themes/default/html/views/link/remove.php b/modules/cms-ui/themes/default/html/views/link/remove.php @@ -1,17 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="link" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?>&nbsp;?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form link"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/structure.php b/modules/cms-ui/themes/default/html/views/link/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/link/structure.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/license.php b/modules/cms-ui/themes/default/html/views/login/license.php @@ -1,100 +1,123 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="or-form"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('USER') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_USERNAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($user_name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$user_name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_FULLNAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_FULLNAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($user_fullname))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$user_fullname)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGIN_DATE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_LOGIN_DATE'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($user_login) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($user_login); ?> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('CMS') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cms_name))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($cms_version))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$cms_name)) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$cms_version)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'OPERATOR'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('OPERATOR'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cms_operator))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$cms_operator)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('SYSTEM') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'DATE_TIME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATE_TIME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($time))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$time)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'OPERATING_SYSTEM'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('OPERATING_SYSTEM'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($os))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($release))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($machine))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$os)) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$release)) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$machine)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'INTERPRETER'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('INTERPRETER'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($version))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$version)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('LICENSE') ?></legend><div class="closable"> - <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'license'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('license'))) ?> + </span> </td> </tr> - <?php foreach($software as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($software as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" data-url="<?php echo $url ?>" data-type="external" data-action="" data-method="license" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo $url ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-type="external" data-action="" data-method="" data-id="" data-extra="[]" href="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($license))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$license)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> </div></fieldset> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/license.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/license.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="or-form"> - <group title="message:USER" open="true" show="true"> + <group title="#{USER}" open="true" show="true"> <part class="line"> <part class="label"> <text key="USER_USERNAME"></text> @@ -24,13 +24,13 @@ <text key="USER_LOGIN_DATE"></text> </part> <part class="input"> - <date date="var:user_login"/> + <date date="${user_login}"/> </part> </part> </group> - <group title="message:CMS"> + <group title="#{CMS}"> <part class="line"> <part class="label"> <text key="NAME"></text> @@ -51,7 +51,7 @@ </group> - <group title="message:SYSTEM"> + <group title="#{SYSTEM}"> <part class="line"> <part class="label"> <text key="DATE_TIME"></text> @@ -81,7 +81,7 @@ </group> - <group title="message:LICENSE"> + <group title="#{LICENSE}"> <table filter="false"> <row class="headline"> @@ -95,7 +95,7 @@ <list list="software" extract="true"> <row class="data"> <column class="clickable"> - <link type="external" url="var:url"> + <link type="external" url="${url}"> <text var="name"></text> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/login/login.php b/modules/cms-ui/themes/default/html/views/login/login.php @@ -1,134 +1,147 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false" data-after-success="reloadAll"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=(config('login','logo','enabled')); if($if3){?> - <?php $if4=!((config('login','logo','url'))==FALSE); if($if4){?> - <a target="_self" data-url="<?php echo config('login','logo','url') ?>" data-action="" data-method="login" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="<?php echo config('login','logo','image') ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" data-after-success="reloadAll" class="or-form login"> + <?php $if3=(config('login','logo','enabled')); if($if3) { ?> + <?php $if4=!((config('login','logo','url'))==FALSE); if($if4) { ?> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(config('login','logo','url'))) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="<?php echo encodeHtml(htmlentities(config('login','logo','image'))) ?>" class=""> + </img> </a> - <?php } ?> - <?php if(!$if4){?> - <img src="<?php echo config('login','logo','image') ?>" /> - <?php } ?> - <?php } ?> - <?php $if3=!((config('login','motd'))==FALSE); if($if3){?> + <?php } ?> + <?php if(!$if4) { ?> + <img src="<?php echo encodeHtml(htmlentities(config('login','logo','image'))) ?>" class=""> + </img> + <?php } ?> + <?php } ?> + <?php $if3=!((config('login','motd'))==FALSE); if($if3) { ?> <div class="message info"> - <span><?php echo nl2br(encodeHtml(htmlentities(config('login','motd')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(config('login','motd'))) ?> + </span> </div> - <?php } ?> - <?php $if3=(config('login','nologin')); if($if3){?> + <?php } ?> + <?php $if3=(config('login','nologin')); if($if3) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN_NOLOGIN_DESC'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LOGIN_NOLOGIN_DESC'))) ?> + </span> </div> - <?php } ?> - <?php $if3=(config('security','readonly')); if($if3){?> + <?php } ?> + <?php $if3=(config('security','readonly')); if($if3) { ?> <div class="message warn"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_READONLY_DESC'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_READONLY_DESC'))) ?> + </span> </div> - <?php } ?> - <?php $if3=(!config('login','nologin')); if($if3){?> + <?php } ?> + <?php $if3=(!config('login','nologin')); if($if3) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_login_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_USERNAME'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </label> </div> <div class="input"> - <?php $if6=!(isset($$force_username)); if($if6){?> - <div class="inputholder"><input placeholder="<?php echo lang('USER_USERNAME') ?>" id="<?php echo REQUEST_ID ?>_login_name" name="<?php if ('') echo ''.'_' ?>login_name<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="128" class="name" value="<?php echo Text::encodeHtml(@$login_name) ?>" /><?php if (false) { ?><input type="hidden" name="login_name" value="<?php $login_name ?>"/><?php } ?></div> - <?php } ?> - <?php if(!$if6){?> - <input type="hidden" name="login_name" value="<?php echo $login_name ?>"/> - <span><?php echo nl2br(encodeHtml(htmlentities($force_username))); ?></span> - <?php } ?> + <?php $if6=!(isset($force_username)); if($if6) { ?> + <input name="login_name" disabled="" required="required" placeholder="<?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?>" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$login_name)) ?>" class="name"> + </input> + <?php } ?> + <?php if(!$if6) { ?> + <input type="hidden" name="login_name" value="<?php echo encodeHtml(htmlentities(@$login_name)) ?>" class=""> + </input> + <span class=""><?php echo encodeHtml(htmlentities(@$force_username)) ?> + </span> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_login_password" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_PASSWORD'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_PASSWORD'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="login_password" id="<?php echo REQUEST_ID ?>_login_password" size="20" maxlength="256" class="name" value="" /></div> + <div class="inputholder"><input type="password" name="login_password" size="20" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$login_password)) ?>" class="name"> + </input></div> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'remember';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_remember" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'REMEMBER_ME'.'')))); ?></span> + <input type="checkbox" name="remember" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$remember)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('REMEMBER_ME'))) ?> + </span> </label> </div> </div> - <?php } ?> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo false?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('USER_NEW_PASSWORD') ?></legend><div class="closable"> + <?php } ?> + <fieldset class="or-group toggle-open-close closed"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_NEW_PASSWORD'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_NEW_PASSWORD'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password1" id="<?php echo REQUEST_ID ?>_password1" size="25" maxlength="256" class="" value="" /></div> + <div class="inputholder"><input type="password" name="password1" size="25" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password1)) ?>" class=""> + </input></div> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password2" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_NEW_PASSWORD_REPEAT'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_NEW_PASSWORD_REPEAT'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password2" id="<?php echo REQUEST_ID ?>_password2" size="25" maxlength="256" class="" value="" /></div> + <div class="inputholder"><input type="password" name="password2" size="25" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password2)) ?>" class=""> + </input></div> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo false?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('USER_TOKEN') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close closed"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_user_token" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_TOKEN'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_TOKEN'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_user_token" name="<?php if ('') echo ''.'_' ?>user_token<?php if (false) echo '_disabled' ?>" type="text" maxlength="30" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="user_token" value="<?php '' ?>"/><?php } ?></div> + <input name="user_token" disabled="" type="text" maxlength="30" value="" class=""> + </input> </div> </div> </div></fieldset> - <?php $if3=(intval('1')<intval(@count($dbids))); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><img src="/themes/default/images/icon/method/database.svg" /><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('DATABASE') ?></legend><div class="closable"> + <?php $if3=(intval('1')<intval('size:dbids')); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_dbid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'DATABASE'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATABASE'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,$dbid,0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="<?php echo encodeHtml(htmlentities(@$dbid)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <?php } ?> - <?php if(!$if3){?> - <input type="hidden" name="dbid" value="<?php echo $dbid ?>"/> - <?php } ?> - <input type="hidden" name="objectid" value="<?php echo $objectid ?>"/> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> - <input type="hidden" name="projectid" value="<?php echo $projectid ?>"/> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('menu_login') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + <?php if(!$if3) { ?> + <input type="hidden" name="dbid" value="<?php echo encodeHtml(htmlentities(@$dbid)) ?>" class=""> + </input> + <?php } ?> + <input type="hidden" name="objectid" value="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + </input> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> + <input type="hidden" name="projectid" value="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" class=""> + </input> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/login.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/login.tpl.src.xml @@ -1,36 +1,36 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form cancel="false" label="message:menu_login" visible="true" action="login" subaction="login" afterSuccess="reloadAll"> - <if true="config:login/logo/enabled"> - <if not="not" empty="config:login/logo/url"> - <link url="config:login/logo/url" target="_top"> - <image url="config:login/logo/image"></image> + <form cancel="false" label="#{menu_login}" visible="true" action="login" subaction="login" afterSuccess="reloadAll"> + <if true="%{login/logo/enabled}"> + <if not="not" empty="%{login/logo/url}"> + <link url="%{login/logo/url}" target="_top"> + <image url="%{login/logo/image}"></image> </link> </if> <else> - <image url="config:login/logo/image"></image> + <image url="%{login/logo/image}"></image> </else> </if> - <if not="not" empty="config:login/motd"> + <if not="not" empty="%{login/motd}"> <part class="message info"> - <text value="config:login/motd"></text> + <text value="%{login/motd}"></text> </part> </if> - <if true="config:login/nologin"> + <if true="%{login/nologin}"> <part class="message error"> <text key="LOGIN_NOLOGIN_DESC"></text> </part> </if> - <if true="config:security/readonly"> + <if true="%{security/readonly}"> <part class="message warn"> <text key="GLOBAL_READONLY_DESC"></text> </part> </if> - <if false="config:login/nologin"> + <if false="%{login/nologin}"> <part class="line"> <part class="label"> @@ -39,13 +39,13 @@ </label> </part> <part class="input"> - <if not="true" present="var:force_username"> + <if not="true" present="force_username"> <input type="text" name="login_name" class="name" value="" - hint="message:USER_USERNAME" size="20" maxlength="128" focus="true" required="true"></input> + hint="#{USER_USERNAME}" size="20" maxlength="128" focus="true" required="true"></input> </if> <else> <hidden name="login_name"></hidden> - <text value="var:force_username"></text> + <text value="${force_username}"></text> </else> </part> </part> @@ -82,7 +82,7 @@ <!-- <if true="property:mustChangePassword"> --> - <group title="message:USER_NEW_PASSWORD" open="false" show="false"> + <group title="#{USER_NEW_PASSWORD}" open="false" show="false"> <part class="line"> <part class="label"> <label for="password1"> @@ -105,7 +105,7 @@ </part> </group> - <group title="message:USER_TOKEN" open="false" show="false"> + <group title="#{USER_TOKEN}" open="false" show="false"> <part class="line"> <part class="label"> <label for="user_token"> @@ -132,7 +132,7 @@ <if value="size:dbids" greaterthan="1"> <!-- Mehr als 1 Datenbank zur Auswahl. Auswahlfeld anzeigen. --> - <group title="message:DATABASE" icon="database" open="true"> + <group title="#{DATABASE}" icon="database" open="true"> <part class="line"> <part class="label"> <label for="dbid"> @@ -157,7 +157,7 @@ <hidden name="languageid"></hidden> </form> <!-- - <newline /> <newline /> <link url="config:login/gpl/url" + <newline /> <newline /> <link url="%{login/gpl/url}" type="external" class="copyright"> <text key="GPL"></text> </link> --> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/openid.php b/modules/cms-ui/themes/default/html/views/login/openid.php @@ -1,50 +1,63 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="_top" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=(config('security','openid','enable')); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPENID') ?></legend><div class="closable"> + <form name="" target="_self" data-target="_top" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> + <?php $if3=(config('security','openid','enable')); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'openid_user'.'')))); ?></span> - <?php $if7=!((config('security','openid','logo_url'))==FALSE); if($if7){?> - <img src="<?php echo config('security','openid','logo_url') ?>" /> - <?php } ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('openid_user'))) ?> + </span> + <?php $if7=!((config('security','openid','logo_url'))==FALSE); if($if7) { ?> + <img src="<?php echo encodeHtml(htmlentities(config('security','openid','logo_url'))) ?>" class=""> + </img> + <?php } ?> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('openid_provider',$openid_providers,$openid_provider) ?> - <?php $if7=($openid_user_identity); if($if7){?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_openid_provider_identity" name="<?php if ('') echo ''.'_' ?>openid_provider<?php if (false) echo '_disabled' ?>" value="identity"<?php if('identity'==@$openid_provider)echo ' checked="checked"' ?> /> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_openid_url" name="<?php if ('') echo ''.'_' ?>openid_url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$openid_url) ?>" /><?php if (false) { ?><input type="hidden" name="openid_url" value="<?php $openid_url ?>"/><?php } ?></div> - <?php } ?> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(openid_provider,$openid_providers,${openid_provider}) ?> ?> + <?php } ?> + <?php $if7=($openid_user_identity); if($if7) { ?> + <input type="radio" name="openid_provider" disabled="" value="identity" checked="<?php echo encodeHtml(htmlentities(@$openid_provider)) ?>" class=""> + </input> + <input name="openid_url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$openid_url)) ?>" class="name"> + </input> + <?php } ?> </div> </div> </div></fieldset> - <?php $if4=(intval('1')<intval(@count($dbids))); if($if4){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><img src="/themes/default/images/icon/method/database.svg" /><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('DATABASE') ?></legend><div class="closable"> + <?php $if4=(intval('1')<intval('size:dbids')); if($if4) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_dbid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'DATABASE'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATABASE'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,$actdbid,0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> - <input type="hidden" name="screenwidth" value="9999"/> + <input name="dbid" value="<?php echo encodeHtml(htmlentities(@$actdbid)) ?>" size="1" class=""> + </input> + <input type="hidden" name="screenwidth" value="9999" class=""> + </input> </div> </div> </div></fieldset> - <?php } ?> - <?php if(!$if4){?> - <input type="hidden" name="dbid" value="<?php echo $actdbid ?>"/> - <?php } ?> - <input type="hidden" name="objectid" value="<?php echo $objectid ?>"/> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> - <input type="hidden" name="projectid" value="<?php echo $projectid ?>"/> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <?php } ?> - <?php if(!$if3){?> + <?php } ?> + <?php if(!$if4) { ?> + <input type="hidden" name="dbid" value="<?php echo encodeHtml(htmlentities(@$actdbid)) ?>" class=""> + </input> + <?php } ?> + <input type="hidden" name="objectid" value="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + </input> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> + <input type="hidden" name="projectid" value="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" class=""> + </input> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + <?php } ?> + <?php if(!$if3) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'OPENID_NOT_ENABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('OPENID_NOT_ENABLED'))) ?> + </span> </div> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/openid.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/openid.tpl.src.xml @@ -4,18 +4,18 @@ <form action="login" subaction="login" target="_top"> <!-- Open-Id --> - <if true="config:security/openid/enable"> - <group title="message:OPENID"> + <if true="%{security/openid/enable}"> + <group title="#{OPENID}"> <part class="line"> <part class="label"> <text key="openid_user"></text> - <if not="true" empty="config:security/openid/logo_url"> - <image url="config:security/openid/logo_url"></image> + <if not="true" empty="%{security/openid/logo_url}"> + <image url="%{security/openid/logo_url}"></image> </if> </part> <part class="input"> <radiobox name="openid_provider" list="openid_providers"></radiobox> - <if true="var:openid_user_identity"> + <if true="${openid_user_identity}"> <radio name="openid_provider" value="identity"></radio> <input name="openid_url" class="name" size="20"></input> </if> @@ -24,7 +24,7 @@ </group> <if value="size:dbids" greaterthan="1"> - <group title="message:DATABASE" icon="database"> + <group title="#{DATABASE}" icon="database"> <part class="line"> <part class="label"> <label for="dbid"> @@ -32,14 +32,14 @@ </label> </part> <part class="input"> - <selectbox name="dbid" list="dbids" default="var:actdbid"></selectbox> + <selectbox name="dbid" list="dbids" default="${actdbid}"></selectbox> <hidden name="screenwidth" default="9999"></hidden> </part> </part> </group> </if> <else> - <hidden name="dbid" default="var:actdbid"></hidden> + <hidden name="dbid" default="${actdbid}"></hidden> </else> <hidden name="objectid"></hidden> <hidden name="modelid"></hidden> @@ -53,6 +53,6 @@ </else> </form> - <!-- <newline></newline> <newline></newline> <link url="config:login/gpl/url" + <!-- <newline></newline> <newline></newline> <link url="%{login/gpl/url}" target="_top" class="copyright"> <text key="GPL"></text> </link> --> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/password.php b/modules/cms-ui/themes/default/html/views/login/password.php @@ -1,43 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('login','send_password')); if($if2){?> - <form name="" target="_self" data-target="view" action="./" data-method="password" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="password" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <?php $if2=(config('login','send_password')); if($if2) { ?> + <form name="" target="_self" data-target="view" action="./" data-method="password" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_password.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_password') ?> - </h2> - <p> - <?php echo langHtml('logo_password_text') ?> - </p> - - </div> -</div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_USERNAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_username" name="<?php if ('') echo ''.'_' ?>username<?php if (false) echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$username) ?>" /><?php if (false) { ?><input type="hidden" name="username" value="<?php $username ?>"/><?php } ?></div> + <input name="username" disabled="" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DATABASE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DATABASE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,'actdbid',0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="actdbid" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <?php } ?> - <?php if(!$if2){?> + </form> + <?php } ?> + <?php if(!$if2) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PASSWORD_NOT_ENABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PASSWORD_NOT_ENABLED'))) ?> + </span> </div> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/password.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/password.tpl.src.xml @@ -3,7 +3,7 @@ <header back="true"></header> - <if true="config:login/send_password"> + <if true="%{login/send_password}"> <form> <logo name="password"></logo> diff --git a/modules/cms-ui/themes/default/html/views/login/passwordcode.php b/modules/cms-ui/themes/default/html/views/login/passwordcode.php @@ -1,39 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="_top" action="./" data-method="passwordcode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="passwordcode" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="_top" action="./" data-method="passwordcode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> + <tr class=""> <td colspan="2" class="logo"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_password.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_password') ?> - </h2> - <p> - <?php echo langHtml('logo_password_text') ?> - </p> - - </div> -</div> </div> </td> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('mail_code')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('mail_code'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if (false) { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> + <td class=""> + <input name="code" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> + </input> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> - </div> </td> </tr> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/register.php b/modules/cms-ui/themes/default/html/views/login/register.php @@ -1,30 +1,18 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('login','register')); if($if2){?> - <form name="" target="_self" data-target="view" action="./" data-method="register" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="register" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <?php $if2=(config('login','register')); if($if2) { ?> + <form name="" target="_self" data-target="view" action="./" data-method="register" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_register.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_register') ?> - </h2> - <p> - <?php echo langHtml('logo_register_text') ?> - </p> - - </div> -</div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mail" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_MAIL')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_MAIL'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="mail" value="<?php '' ?>"/><?php } ?></div> + <input name="mail" disabled="" type="text" maxlength="256" value="" class="focus"> + </input> </div> </div> <div class="line"> @@ -33,10 +21,11 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <?php } ?> - <?php if(!$if2){?> + </form> + <?php } ?> + <?php if(!$if2) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'REGISTER_NOT_ENABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('REGISTER_NOT_ENABLED'))) ?> + </span> </div> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/register.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/register.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <if true="config:login/register"> + <if true="%{login/register}"> <form> <logo name="register"></logo> diff --git a/modules/cms-ui/themes/default/html/views/login/registercode.php b/modules/cms-ui/themes/default/html/views/login/registercode.php @@ -1,52 +1,45 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="registercode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="registercode" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="registercode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_register.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_register') ?> - </h2> - <p> - <?php echo langHtml('logo_register_text') ?> - </p> - - </div> -</div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_REGISTER_CODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_REGISTER_CODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="code" value="<?php '' ?>"/><?php } ?></div> + <input name="code" disabled="" type="text" maxlength="256" value="" class="focus"> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_USERNAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_username" name="<?php if ('') echo ''.'_' ?>username<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$username) ?>" /><?php if (false) { ?><input type="hidden" name="username" value="<?php $username ?>"/><?php } ?></div> + <input name="username" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_PASSWORD')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_PASSWORD'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password" id="<?php echo REQUEST_ID ?>_password" size="25" maxlength="256" class="" value="" /></div> + <div class="inputholder"><input type="password" name="password" size="25" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password)) ?>" class=""> + </input></div> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DATABASE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DATABASE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,'actdbid',0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="actdbid" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/info.php b/modules/cms-ui/themes/default/html/views/model/info.php @@ -1,15 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="model" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form model" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="model" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="model" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form model"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <a class="or-link-btn" target="_self" data-type="edit" data-action="model" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/model/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <a target="_self" data-type="edit" data-action="model" data-method="prop" data-id="" data-extra="[]" href="/#/model/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/listing.php b/modules/cms-ui/themes/default/html/views/model/listing.php @@ -1,42 +1,53 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <a target="_self" data-action="" data-method="listing" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon/icon_model.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <a target="_self" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon_model.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <?php $if8=(isset($default_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($default_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </span> + <?php } ?> </td> - <td> - <?php $if8=(isset($select_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_select')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_selected')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($select_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_select'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_selected'))) ?> + </span> + <?php } ?> </td> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/listing.tpl.src.xml b/modules/cms-ui/themes/default/html/views/model/listing.tpl.src.xml @@ -1,3 +1,3 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="group" name="GLOBAL_MODELS" widths="50%,25%,25%"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><link target="cms_main"><image file="icon_model"></image><text var="name" maxlength="25"></text></link></column><column url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="group" name="GLOBAL_MODELS" widths="50%,25%,25%"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="${url}"><link target="cms_main"><image file="icon_model"></image><text var="name" maxlength="25"></text></link></column><column url="${default_url}"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="${select_url}"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/prop.php b/modules/cms-ui/themes/default/html/views/model/prop.php @@ -1,32 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form model" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="model" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form model"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'is_default';$default = false;$readonly = $is_default;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_is_default" class="label"><?php echo lang('GLOBAL_is_default') ?> + <input type="checkbox" name="is_default" disabled="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/model/prop.tpl.src.xml @@ -15,7 +15,7 @@ <part class="label"> </part> <part class="input"> - <checkbox name="is_default" readonly="var:is_default"></checkbox> + <checkbox name="is_default" readonly="${is_default}"></checkbox> <label key="GLOBAL_is_default" for="is_default" /> </part> </part> diff --git a/modules/cms-ui/themes/default/html/views/model/remove.php b/modules/cms-ui/themes/default/html/views/model/remove.php @@ -1,37 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form model" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="model" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form model"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/model/remove.tpl.src.xml @@ -12,7 +12,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/model/structure.php b/modules/cms-ui/themes/default/html/views/model/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/model/structure.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/modellist/add.php b/modules/cms-ui/themes/default/html/views/modellist/add.php @@ -1,11 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="modellist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form modellist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="modellist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="modellist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form modellist"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_name'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/modellist/show.php b/modules/cms-ui/themes/default/html/views/modellist/show.php @@ -1,47 +1,58 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="model" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/model/<?php echo $id ?>"> - <i class="image-icon image-icon--action-model"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="model" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/model/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-model"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <?php $if5=(!$is_default); if($if5){?> + <?php $if5=(!$is_default); if($if5) { ?> <td class="clickable"> - <?php $if7=(isset($id)); if($if7){?> - <a target="_self" data-type="post" data-action="model" data-method="setdefault" data-id="<?php echo $id ?>" data-extra="[]" data-data="{&quot;action&quot;:&quot;model&quot;,&quot;subaction&quot;:&quot;setdefault&quot;,&quot;id&quot;:&quot;<?php echo $id ?>&quot;,&quot;token&quot;:&quot;<?php echo token() ?>&quot;,&quot;none&quot;:&quot;0&quot;}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> + <?php $if7=(isset($id)); if($if7) { ?> + <a target="_self" data-type="post" data-action="model" data-method="setdefault" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" data-data="{"action":"model","subaction":"setdefault","id":"<?php echo encodeHtml(htmlentities(@$id)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> </a> - <?php } ?> + <?php } ?> </td> - <?php } ?> - <?php if(!$if5){?> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></em> + <?php } ?> + <?php if(!$if5) { ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </em> </td> - <?php } ?> + <?php } ?> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> <tr class="data"> <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/modellist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/modellist/show.tpl.src.xml @@ -16,16 +16,16 @@ <row class="data"> <column class="clickable"> - <link type="open" name="var:name" action="model" id="var:id"> + <link type="open" name="${name}" action="model" id="${id}"> <image action="model"></image> <text var="name" maxlength="25"></text> </link> </column> - <if false="var:is_default"> + <if false="${is_default}"> <column class="clickable"> <if present="id"> - <link type="post" action="model" subaction="setdefault" id="var:id"> + <link type="post" action="model" subaction="setdefault" id="${id}"> <text text="GLOBAL_make_default"></text> </link> </if> diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.php b/modules/cms-ui/themes/default/html/views/object/aclform.php @@ -1,11 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="aclform" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="aclform" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('users') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="aclform" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_all" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ALL')))); ?></span> + <input type="radio" name="type" disabled="" value="all" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_ALL'))) ?> + </span> </label> </div> <div class="input"> @@ -13,89 +15,75 @@ </div> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_user" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="user"<?php if('user'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_user" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span> + <input type="radio" name="type" disabled="" value="user" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_userid" name="userid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($users,'',1,0) ?><?php if (count($users)==0) { ?><input type="hidden" name="userid" value="" /><?php } ?><?php if (count($users)==1) { ?><input type="hidden" name="userid" value="<?php echo array_keys($users)[0] ?>" /><?php } ?> - </select></div> + <input name="userid" value="" size="1" class=""> + </input> </div> </div> - <?php $if4=(isset($groups)); if($if4){?> + <?php $if4=(isset($groups)); if($if4) { ?> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_group" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="group"<?php if('group'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_group" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_GROUP')))); ?></span> + <input type="radio" name="type" disabled="" value="group" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_GROUP'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_groupid" name="groupid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($groups,'',1,0) ?><?php if (count($groups)==0) { ?><input type="hidden" name="groupid" value="" /><?php } ?><?php if (count($groups)==1) { ?><input type="hidden" name="groupid" value="<?php echo array_keys($groups)[0] ?>" /><?php } ?> - </select></div> + <input name="groupid" value="" size="1" class=""> + </input> </div> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('language') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_languageid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_languageid" name="languageid" title="" class=""<?php if (count($languages)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($languages,'',0,0) ?><?php if (count($languages)==0) { ?><input type="hidden" name="languageid" value="" /><?php } ?><?php if (count($languages)==1) { ?><input type="hidden" name="languageid" value="<?php echo array_keys($languages)[0] ?>" /><?php } ?> - </select></div> + <input name="languageid" value="" size="1" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('acl') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php foreach($show as $k=>$t){ ?> - <div> - <?php $if8=($t=='read'); if($if8){?> - <?php $$t= true; ?> - <?php { $tmpname = $t;$default = false;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <?php } ?> - <?php if(!$if8){?> - <?php unset($$t) ?> - <?php { $tmpname = $t;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <?php } ?> - <label for="<?php echo REQUEST_ID ?>_<?php echo $t ?>_" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'')))); ?></span> + <?php foreach($show as $k=>$t) { ?> + <div class=""> + <?php $if8=($t=='read'); if($if8) { ?> + <?php { $$t= true; ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${t)) ?>}" class=""> + </input> + <?php } ?> + <?php if(!$if8) { ?> + <?php { unset($$t) ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${t)) ?>}" class=""> + </input> + <?php } ?> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </label> </div> - <?php } ?> + <?php } ?> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/aclform.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <header back="true" /> <form> - <group title="message:users"> + <group title="#{users}"> <part class="line"> <part class="label"> <radio name="type" value="all"></radio> @@ -39,7 +39,7 @@ </if> </group> - <group title="message:language"> + <group title="#{language}"> <part class="line"> <part class="label"> <label for="languageid"> @@ -53,23 +53,23 @@ </part> </group> - <group title="message:acl"> + <group title="#{acl}"> <part class="line"> <part class="label"> </part> <part class="input"> <list list="show" value="t" key="k"> <part> - <if value="var:t" equals="read"> - <set var="var:t" value="true" /> - <checkbox name="var:t" readonly="true"></checkbox> + <if value="${t}" equals="read"> + <set var="${t}" value="true" /> + <checkbox name="${t}" readonly="true"></checkbox> </if> <else> - <set var="var:t" value="false" /> - <checkbox name="var:t" readonly="false"></checkbox> + <set var="${t}" value="false" /> + <checkbox name="${t}" readonly="false"></checkbox> </else> - <label for="var:t" value=""> - <text key="var:t" prefix="acl_"></text> + <label for="${t}" value=""> + <text key="${t}" prefix="acl_"></text> </label> </part> </list> diff --git a/modules/cms-ui/themes/default/html/views/object/copy.php b/modules/cms-ui/themes/default/html/views/object/copy.php @@ -1,27 +1,31 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="copy" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="copy" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="copy" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> <div class="line"> <div class="label"> - <input type="hidden" name="sourceid" value="<?php echo $sourceId ?>"/> + <input type="hidden" name="sourceid" value="<?php echo encodeHtml(htmlentities(@$sourceId)) ?>" class=""> + </input> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities(@$source[name]))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$source['name'])) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <input type="hidden" name="targetid" value="<?php echo $targetId ?>"/> + <input type="hidden" name="targetid" value="<?php echo encodeHtml(htmlentities(@$targetId)) ?>" class=""> + </input> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities(@$target[name]))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$target['name'])) ?> + </span> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/copy.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/copy.tpl.src.xml @@ -3,10 +3,10 @@ <form> <part class="line"> <part class="label"> - <hidden name="sourceid" default="var:sourceId" /> + <hidden name="sourceid" default="${sourceId}" /> </part> <part class="input"> - <text value="arrayvar:source:name" /> + <text value="${source.name}" /> </part> </part> @@ -20,10 +20,10 @@ <part class="line"> <part class="label"> - <hidden name="targetid" default="var:targetId" /> + <hidden name="targetid" default="${targetId}" /> </part> <part class="input"> - <text value="arrayvar:target:name" /> + <text value="${target.name}" /> </part> </part> diff --git a/modules/cms-ui/themes/default/html/views/object/info.php b/modules/cms-ui/themes/default/html/views/object/info.php @@ -1,216 +1,269 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_filename'))) ?> + </span> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('file_extension'))) ?> + </span> </div> <div class="input"> - <span class="extension"><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + <span class="extension"><?php echo encodeHtml(htmlentities(@$extension)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_description'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$full_filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_size" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_SIZE'))) ?> + </span> </label> </div> <div class="input"> </div> - <span><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$size)) ?> + </span> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mimetype" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_mimetype'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$mimetype)) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="action" target="_self" data-type="dialog" data-action="" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="size" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="/#//" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_size'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('#{id'))) ?>} + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$objectid)) ?> + </span> </div> </div> - <?php $if4=(isset($cache_filename)); if($if4){?> + <?php $if4=(isset($cache_filename)); if($if4) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_cache_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CACHE_FILENAME'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($cache_filemtime) ?> + <span class=""><?php echo encodeHtml(htmlentities(@$cache_filename)) ?> + </span> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> + <?php } ?> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_PAGES'))) ?> + </span> </label> </div> <div class="input"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php foreach($pages as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr> - <td> - <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="info" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon_page.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($pages as $list_key=>$list_value) { extract($list_value); ?> + <tr class=""> + <td class=""> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_page.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php $if6=(($pages)==FALSE); if($if6){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> - <?php } ?> + <?php $if6=(($pages)==FALSE); if($if6) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('validity') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="./#//"> + <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="/#//" class=""> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_state'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_state'))) ?> + </span> </div> <div class="input"> - <?php $if8=($is_valid); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'is_yes'.'')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'is_no'.'')))); ?></span> - <?php } ?> + <?php $if8=($is_valid); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('is_yes'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('is_no'))) ?> + </span> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('from')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('from'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($valid_from_date) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($valid_from_date); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('until')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('until'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($valid_to_date) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($valid_to_date); ?> + <?php } ?> </div> </div> </a> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_created'))) ?> + </span> </div> <div class="input"> - <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) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_lastchange'))) ?> + </span> </div> <div class="input"> - <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) ?> - <br/> - <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) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_published'))) ?> + </span> </label> </div> <div class="input"> - <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($published_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($published_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('settings') ?></legend><div class="closable"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php foreach($settings as $name=>$value){ ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($settings as $name=>$value) { ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> <td class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml @@ -36,7 +36,7 @@ </part> </group> - <group title="message:additional_info"> + <group title="#{additional_info}"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -78,7 +78,7 @@ </part> <part class="line"> <part class="label"> - <text text="message:id"></text> + <text text="#{id}"></text> </part> <part class="input"> <text var="objectid"></text> @@ -95,7 +95,7 @@ <text var="cache_filename"></text> <newline></newline> <image icon="el_date"></image> - <date date="var:cache_filemtime"></date> + <date date="${cache_filemtime}"></date> </part> </part> </if> @@ -110,7 +110,7 @@ <list list="pages" extract="true"> <row> <column> - <link url="var:url" target="cms_main"> + <link url="${url}" target="cms_main"> <image type="page"></image> <text var="name"></text> </link> @@ -124,7 +124,7 @@ </part> </part> </group> - <group title="message:validity"> + <group title="#{validity}"> <part class="clickable"> <link subaction="settings" type="dialog"> <part class="line"> @@ -132,7 +132,7 @@ <text key="global_state"></text> </part> <part class="input"> - <if true="var:is_valid"><text key="is_yes" /></if> + <if true="${is_valid}"><text key="is_yes" /></if> <else><text key="is_no" /></else> </part> </part> @@ -141,7 +141,7 @@ <text text="from"></text> </part> <part class="input"> - <date date="var:valid_from_date" /> + <date date="${valid_from_date}" /> </part> </part> <part class="line"> @@ -149,23 +149,23 @@ <text text="until"></text> </part> <part class="input"> - <date date="var:valid_to_date" /> + <date date="${valid_to_date}" /> </part> </part> </link> </part> </group> - <group title="message:prop_userinfo"> + <group title="#{prop_userinfo}"> <part class="line"> <part class="label"> <text text="global_created"></text> </part> <part class="input"> <image elementtype="date"></image> - <date date="var:create_date"></date> + <date date="${create_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:create_user"></user> + <user user="${create_user}"></user> </part> </part> <part class="line"> @@ -174,10 +174,10 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </part> </part> <part class="line"> @@ -188,15 +188,15 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:published_date"></date> + <date date="${published_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:published_user"></user> + <user user="${published_user}"></user> </part> </part> </group> - <group title="message:settings"> + <group title="#{settings}"> <table filter="true"> <list list="settings" key="name" value="value" > <row class="data"> diff --git a/modules/cms-ui/themes/default/html/views/object/inherit.php b/modules/cms-ui/themes/default/html/views/object/inherit.php @@ -1,30 +1,21 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="inherit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($type=='folder'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <?php $if3=($type=='folder'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $inherit= '1'; ?> - <?php { $tmpname = 'inherit';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_inherit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'inherit_rights'.'')))); ?></span> + <?php { $inherit= '1'; ?> + <?php } ?> + <input type="checkbox" name="inherit" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/inherit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/inherit.tpl.src.xml @@ -3,8 +3,8 @@ <header back="true" /> <form> - <if value="var:type" equals="folder"> - <group title="message:options"> + <if value="${type}" equals="folder"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/object/name.php b/modules/cms-ui/themes/default/html/views/object/name.php @@ -1,8 +1,11 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="name" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('alias') ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('name') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?description?</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div></span></label> + <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row or-form-input"><input name="name" disabled="" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-checkbox"><textarea name="description" disabled="" maxlength="255" class="description"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea></label> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/name.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/name.tpl.src.xml @@ -1,9 +1,9 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form label="message:global_save"> + <form label="#{global_save}"> <hidden name="languageid" /> - <group title="message:alias" open="true"> + <group title="#{alias}" open="true"> <input label="name" name="name" maxlength="255" required="true" /> diff --git a/modules/cms-ui/themes/default/html/views/object/prop.php b/modules/cms-ui/themes/default/html/views/object/prop.php @@ -1,9 +1,11 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('global_prop') ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('global_filename') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if (false) echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if (false) { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('alias') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_alias_filename" name="<?php if ('') echo ''.'_' ?>alias_filename<?php if (false) echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$alias_filename) ?>" /><?php if (false) { ?><input type="hidden" name="alias_filename" value="<?php $alias_filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?folder?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_alias_folderid" name="alias_folderid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$alias_folderid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="alias_folderid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="alias_folderid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div></span></label> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row or-form-input"><input name="filename" disabled="" autofocus="autofocus" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$filename)) ?>" class="filename"> + </input></label> + <label class="or-form-row or-form-input"><input name="alias_filename" disabled="" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> + </input></label> + <label class="or-form-row or-form-input"><input name="alias_folderid" value="<?php echo encodeHtml(htmlentities(@$alias_folderid)) ?>" size="1" class=""> + </input></label> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml @@ -1,8 +1,8 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form label="message:global_save"> + <form label="#{global_save}"> - <group title="message:global_prop"> + <group title="#{global_prop}"> <input name="filename" label="global_filename" class="filename" maxlength="150" focus="true" /> diff --git a/modules/cms-ui/themes/default/html/views/object/rights.php b/modules/cms-ui/themes/default/html/views/object/rights.php @@ -1,74 +1,90 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=($type=='folder'); if($if2){?> - <?php } ?> - <?php if(!$if2){?> - <?php } ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <?php $if2=($type=='folder'); if($if2) { ?> + <?php } ?> + <?php if(!$if2) { ?> + <?php } ?> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LANGUAGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> + <?php foreach($show as $list_key=>$t) { ?> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </td> - <?php } ?> + <?php } ?> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_delete'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_delete'))) ?> + </span> </td> </tr> - <?php $if3=(($acls)==FALSE); if($if3){?> + <?php $if3=(($acls)==FALSE); if($if3) { ?> <tr class="data"> - <td colspan="99"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <td colspan="99" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php $if3=!(($acls)==FALSE); if($if3){?> - <?php } ?> - <?php foreach($acls as $aclid=>$acl){ ?><?php extract($acl) ?> + <?php } ?> + <?php $if3=!(($acls)==FALSE); if($if3) { ?> + <?php } ?> + <?php foreach($acls as $aclid=>$acl) { extract($acl); ?> <tr class="data"> - <td> - <?php $if6=(isset($username)); if($if6){?> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span> - <?php } ?> - <?php $if6=(isset($groupname)); if($if6){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($groupname))); ?></span> - <?php } ?> - <?php $if6=!(isset($username)); if($if6){?> - <?php $if7=!(isset($groupname)); if($if7){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span> - <?php } ?> - <?php } ?> + <td class=""> + <?php $if6=(isset($username)); if($if6) { ?> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$username)) ?> + </span> + <?php } ?> + <?php $if6=(isset($groupname)); if($if6) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$groupname)) ?> + </span> + <?php } ?> + <?php $if6=!(isset($username)); if($if6) { ?> + <?php $if7=!(isset($groupname)); if($if7) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_all'))) ?> + </span> + <?php } ?> + <?php } ?> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> - <td> - <?php $if7=($$t); if($if7){?> - <span><?php echo nl2br('&check;'); ?></span> - <?php } ?> + <?php foreach($show as $list_key=>$t) { ?> + <td class=""> + <?php $if7=('var:$t'); if($if7) { ?> + <span class="">&check; + </span> + <?php } ?> </td> - <?php } ?> + <?php } ?> <td class="clickable"> - <a target="_self" data-type="post" data-action="" data-method="delacl" data-id="<?php echo OR_ID ?>" data-extra="{'aclid':'<?php echo $aclid ?>'}" data-data="{&quot;action&quot;:&quot;object&quot;,&quot;subaction&quot;:&quot;delacl&quot;,&quot;id&quot;:&quot;<?php echo OR_ID ?>&quot;,&quot;token&quot;:&quot;<?php echo token() ?>&quot;,&quot;aclid&quot;:&quot;<?php echo $aclid ?>&quot;,&quot;none&quot;:&quot;0&quot;}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_DELETE'.'')))); ?></span> + <a target="_self" data-type="post" data-action="" data-method="delacl" data-id="" data-extra="{'aclid':'<?php echo encodeHtml(htmlentities(@$aclid)) ?>'}" data-data="{"action":"object","subaction":"delacl","id":"",\"token":"<?php echo token() ?>","aclid":"<?php echo encodeHtml(htmlentities(@$aclid)) ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DELETE'))) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="99" class="clickable"> - <a target="_self" date-name="<?php echo lang('menu_aclform') ?>" name="<?php echo lang('menu_aclform') ?>" data-type="dialog" data-action="" data-method="aclform" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'aclform'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('menu_aclform'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('menu_aclform'))) ?>" data-type="dialog" data-action="" data-method="aclform" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'aclform'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <if value="var:type" equals="folder"> + <if value="${type}" equals="folder"> <header views="inherit,aclform" /> </if> <else> @@ -18,7 +18,7 @@ </column> <list list="show" value="t"> <column class="help"> - <text key="var:t" prefix="acl_" suffix="_abbrev"></text> + <text key="${t}" prefix="acl_" suffix="_abbrev"></text> </column> </list> <column class="help"> @@ -62,7 +62,7 @@ </column> </list> <column class="clickable"> - <link type="post" subaction="delacl" var1="aclid" value1="var:aclid"> + <link type="post" subaction="delacl" var1="aclid" value1="${aclid}"> <text key="GLOBAL_DELETE"></text> </link> </column> @@ -70,7 +70,7 @@ </list> <row class="data"> <column colspan="99" class="clickable"> - <link type="dialog" name="message:menu_aclform" subaction="aclform"> + <link type="dialog" name="#{menu_aclform}" subaction="aclform"> <image method="add" /> <text text="new" /> </link> diff --git a/modules/cms-ui/themes/default/html/views/object/settings.php b/modules/cms-ui/themes/default/html/views/object/settings.php @@ -1,39 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="settings" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="settings" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('validity') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="settings" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_validity_from_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'from'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('from'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_from_date" name="<?php if ('') echo ''.'_' ?>valid_from_date<?php if (false) echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_from_date) ?>" /><?php if (false) { ?><input type="hidden" name="valid_from_date" value="<?php $valid_from_date ?>"/><?php } ?></div> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_from_time" name="<?php if ('') echo ''.'_' ?>valid_from_time<?php if (false) echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_from_time) ?>" /><?php if (false) { ?><input type="hidden" name="valid_from_time" value="<?php $valid_from_time ?>"/><?php } ?></div> + <input name="valid_from_date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_date)) ?>" class=""> + </input> + <input name="valid_from_time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_time)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_validity_until_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'until'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('until'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_until_date" name="<?php if ('') echo ''.'_' ?>valid_until_date<?php if (false) echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_until_date) ?>" /><?php if (false) { ?><input type="hidden" name="valid_until_date" value="<?php $valid_until_date ?>"/><?php } ?></div> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_until_time" name="<?php if ('') echo ''.'_' ?>valid_until_time<?php if (false) echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_until_time) ?>" /><?php if (false) { ?><input type="hidden" name="valid_until_time" value="<?php $valid_until_time ?>"/><?php } ?></div> + <input name="valid_until_date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_date)) ?>" class=""> + </input> + <input name="valid_until_time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_time)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('settings') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_settings" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'SETTINGS'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('SETTINGS'))) ?> + </span> </label> </div> <div class="input"> - <textarea name="<?php if ('') echo ''.'_' ?>settings<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo htmlentities(${'settings'}) ?></textarea> + <textarea name="settings" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"> + </textarea> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:validity"> + <group title="#{validity}"> <part class="line"> <part class="label"> <label for="validity_from_date"> @@ -27,7 +27,7 @@ </part> </group> - <group title="message:settings"> + <group title="#{settings}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplate.php b/modules/cms-ui/themes/default/html/views/page/changetemplate.php @@ -1,25 +1,31 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="get" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="changetemplateselectelements" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="templateid" value="<?php echo $templateid ?>"/> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> + <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="get" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <input type="hidden" name="templateid" value="<?php echo encodeHtml(htmlentities(@$templateid)) ?>" class=""> + </input> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_old')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('page_template_old'))) ?> + </span> </div> <div class="input"> - <a target="_self" data-url="<?php echo $template_url ?>" data-action="" data-method="changetemplate" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon_template.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$template_url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_template.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_new')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('page_template_new'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_newtemplateid" name="newtemplateid" title="" class=""<?php if (count($templates)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($templates,'',0,0) ?><?php if (count($templates)==0) { ?><input type="hidden" name="newtemplateid" value="" /><?php } ?><?php if (count($templates)==1) { ?><input type="hidden" name="newtemplateid" value="<?php echo array_keys($templates)[0] ?>" /><?php } ?> - </select></div> + <input name="newtemplateid" value="" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_NEXT') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplate.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/changetemplate.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form method="get" subaction="changetemplateselectelements" visible="true" cancel="true" label="message:BUTTON_NEXT"> + <form method="get" subaction="changetemplateselectelements" visible="true" cancel="true" label="#{BUTTON_NEXT}"> <hidden name="templateid" /> <hidden name="modelid" /> @@ -9,7 +9,7 @@ <text text="page_template_old"></text> </part> <part class="input"> - <link url="var:template_url" target="cms_main"> + <link url="${template_url}" target="cms_main"> <image type="template"></image> <text var="template_name"></text> </link> diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php b/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php @@ -1,15 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="changetemplateselectelements" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="newtemplateid" value="<?php echo $newtemplateid ?>"/> - <?php foreach($elements as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <input type="hidden" name="newtemplateid" value="<?php echo encodeHtml(htmlentities(@$newtemplateid)) ?>" class=""> + </input> + <?php foreach($elements as $list_key=>$list_value) { extract($list_value); ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_<?php echo $newElementsName ?>" name="<?php echo $newElementsName ?>" title="" class=""<?php if (count($newElementsList)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($newElementsList,'',0,0) ?><?php if (count($newElementsList)==0) { ?><input type="hidden" name="<?php echo $newElementsName ?>" value="" /><?php } ?><?php if (count($newElementsList)==1) { ?><input type="hidden" name="<?php echo $newElementsName ?>" value="<?php echo array_keys($newElementsList)[0] ?>" /><?php } ?> - </select></div> + <input name="<?php echo encodeHtml(htmlentities(@$newElementsName)) ?>" value="" size="1" class=""> + </input> </div> </div> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('MENU_CHANGETEMPLATE') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form visible="true" cancel="true" label="message:MENU_CHANGETEMPLATE"> + <form visible="true" cancel="true" label="#{MENU_CHANGETEMPLATE}"> <hidden name="newtemplateid" /> <list list="elements" extract="true"> <part class="line"> @@ -8,7 +8,7 @@ <text var="name"></text> </part> <part class="input"> - <selectbox name="var:newElementsName" default="" list="newElementsList"></selectbox> + <selectbox name="${newElementsName}" default="" list="newElementsList"></selectbox> </part> </part> </list> diff --git a/modules/cms-ui/themes/default/html/views/page/edit.php b/modules/cms-ui/themes/default/html/views/page/edit.php @@ -1,38 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('DESCRIPTION')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DESCRIPTION'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TYPE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + </span> </th> </tr> - <?php $if3=(($elements)==FALSE); if($if3){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOT_FOUND'.'')))); ?></span> + <?php $if3=(($elements)==FALSE); if($if3) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php foreach($elements as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($elements as $list_key=>$list_value) { extract($list_value); ?> <tr class="data clickable"> - <td> - <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="pageelement" data-method="edit" data-id="<?php echo $pageelementid ?>" data-extra="[]" href="./#/pageelement/<?php echo $pageelementid ?>"> - <i class="image-icon image-icon--action-pageelement"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($label))); ?></span> + <td class=""> + <a title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="pageelement" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$pageelementid)) ?>" data-extra="[]" href="/#/pageelement/<?php echo encodeHtml(htmlentities(@$pageelementid)) ?>" class=""> + <i class="image-icon image-icon--action-pageelement"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$label)) ?> + </span> </a> </td> - <td title="<?php echo $desc ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$desc)) ?> + </span> </td> - <td> - <i class="image-icon image-icon--action-el_<?php echo $typename ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('el_'.$typename.'')))); ?></span> + <td class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$typename)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${typename'))) ?>} + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/edit.tpl.src.xml @@ -22,17 +22,17 @@ <list list="elements" extract="true"> <row class="data clickable"> <column> - <link type="open" title="var:desc" name="var:name" action="pageelement" id="var:pageelementid"> + <link type="open" title="${desc}" name="${name}" action="pageelement" id="${pageelementid}"> <image action="pageelement"/> <text var="label"></text> </link> </column> - <column title="var:desc"> + <column title="${desc}"> <text var="desc"></text> </column> <column> - <image elementtype="var:typename"/> - <text prefix="el_" key="var:typename"></text> + <image elementtype="${typename}"/> + <text prefix="el_" key="${typename}"></text> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/page/form.php b/modules/cms-ui/themes/default/html/views/page/form.php @@ -1,110 +1,85 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="form" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="form" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php $if6=(($el)==FALSE); if($if6){?> - <tr> - <td colspan="4"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="form" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php $if6=(($el)==FALSE); if($if6) { ?> + <tr class=""> + <td colspan="4" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php $if6=!(($el)==FALSE); if($if6){?> - <tr> + <?php } ?> + <?php $if6=!(($el)==FALSE); if($if6) { ?> + <tr class=""> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_ELEMENT_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_CHANGE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_CHANGE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <label for="<?php echo REQUEST_ID ?>_<?php echo $saveid ?>" class="label"> - <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <label class="label"> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </label> </td> - <td> - <?php { $tmpname = $saveid;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$saveid)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${saveid)) ?>}" class=""> + </input> </td> - <td> - <?php $if10=(in_array($type,explode(",",'text,date,number')); if($if10){?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $id ?>" name="<?php if ('') echo ''.'_' ?><?php echo $id ?><?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml($value) ?>" /><?php if (false) { ?><input type="hidden" name="<?php echo $id ?>" value="<?php $value ?>"/><?php } ?></div> - <?php } ?> - <?php $if10=($type=='longtext'); if($if10){?> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?><?php echo $id ?><?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($value) ?></textarea></div> - <?php } ?> - <?php $if10=(in_array($type,explode(",",'select,link,list')); if($if10){?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_<?php echo $id ?>" name="<?php echo $id ?>" title="" class=""<?php if (count($list)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($list,$value,0,0) ?><?php if (count($list)==0) { ?><input type="hidden" name="<?php echo $id ?>" value="" /><?php } ?><?php if (count($list)==1) { ?><input type="hidden" name="<?php echo $id ?>" value="<?php echo array_keys($list)[0] ?>" /><?php } ?> - </select></div> - <?php } ?> + <td class=""> + <?php $if10=(in_array($type,explode(",",'text,date,number')); if($if10) { ?> + <input name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$value)) ?>" class=""> + </input> + <?php } ?> + <?php $if10=($type=='longtext'); if($if10) { ?> + <textarea name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$value)) ?> + </textarea> + <?php } ?> + <?php $if10=(in_array($type,explode(",",'select,link,list')); if($if10) { ?> + <input name="<?php echo encodeHtml(htmlentities(@$id)) ?>" value="<?php echo encodeHtml(htmlentities(@$value)) ?>" size="1" class=""> + </input> + <?php } ?> </td> </tr> - <?php } ?>