commit ce4efd65628bc83ad2d8e4bf2ea40165b5dbd8b5 parent 7475a30d814f63a91f6f9954e4124df2687791e8 Author: Jan Dankert <develop@jandankert.de> Date: Fri, 2 Oct 2020 23:11:48 +0200 Cleanup: No '.inputholder' any more, notices with links to objects. Diffstat:
171 files changed, 746 insertions(+), 1121 deletions(-)
diff --git a/modules/cms/action/Action.class.php b/modules/cms/action/Action.class.php @@ -2,6 +2,7 @@ namespace cms\action; +use cms\base\Language as L; use cms\model\BaseObject; use cms\model\ModelBase; use cms\model\User; @@ -64,21 +65,12 @@ class Action } - protected function setStyle($style) - { - $this->setControlVar("new_style", $style); - } - - public function __construct() { - //$this->request = new RequestParams(); - $this->currentUser = Session::getUser(); $this->templateVars['errors'] = array(); $this->templateVars['notices'] = array(); - $this->templateVars['control'] = array(); $this->templateVars['output'] = array(); } @@ -161,19 +153,6 @@ class Action /** - * Setzt eine Variable f�r die Oberfl�che. - * - * @param String $varName Schl�ssel - * @param Mixed $value - * @deprecated Diese Schicht soll keine Dialog-Logik enthalten. - */ - protected function setControlVar($varName, $value) - { - $this->templateVars['control'][$varName] = $value; - } - - - /** * Setzt eine Liste von Variablen f�r die Oberfl�che. * * @param array $varList Assoziatives Array @@ -195,7 +174,7 @@ class Action public function addValidationError($name, $message = "COMMON_VALIDATION_ERROR", $vars = array(), $log = array()) { if (!empty($message)) - $this->addNotice('', '', $message, Action::NOTICE_ERROR, $vars, $log); + $this->addNotice('', 0, '', $message, Action::NOTICE_ERROR, $vars, $log); $this->templateVars['errors'][] = $name; } @@ -214,7 +193,7 @@ class Action * @param string $message */ protected function addNoticeFor($baseObject,$key,$vars = array(), $message='') { - $this->addNotice( strtolower(ClassUtils::getSimpleClassName($baseObject)),$baseObject->getName(),$key,Action::NOTICE_OK,$vars,array($message)); + $this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_OK, $vars, array($message)); } /** @@ -224,7 +203,7 @@ class Action * @param string $message */ protected function addInfoFor($baseObject,$key,$vars = array(), $message='') { - $this->addNotice( strtolower(ClassUtils::getSimpleClassName($baseObject)),$baseObject->getName(),$key,Action::NOTICE_INFO,$vars,array($message)); + $this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_INFO, $vars, array($message)); } /** @@ -234,7 +213,7 @@ class Action * @param string $message */ protected function addWarningFor($baseObject,$key,$vars = array(), $message='') { - $this->addNotice( strtolower(ClassUtils::getSimpleClassName($baseObject)),$baseObject->getName(),$key,Action::NOTICE_WARN,$vars,array($message)); + $this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_WARN, $vars, array($message)); } /** @@ -244,20 +223,21 @@ class Action * @param string $message */ protected function addErrorFor($baseObject,$key,$vars = array(), $message='') { - $this->addNotice( strtolower(ClassUtils::getSimpleClassName($baseObject)),$baseObject->getName(),$key,Action::NOTICE_ERROR,$vars,array($message)); + $this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_ERROR, $vars, array($message)); } /** * F�gt ein Meldung hinzu. * * @param String $type Typ des Objektes, zu dem diese Meldung geh�rt. + * @param $id * @param String $name Name des Objektes, zu dem diese Meldung geh�rt. * @param String $text Textschl�ssel der Fehlermeldung (optional) * @param String $status Einer der Werte Action::NOTICE_(OK|WARN|ERROR) * @param array $vars Variablen f�r den Textschl�ssel * @param array $log Weitere Hinweistexte f�r diese Meldung. */ - protected function addNotice($type, $name, $text, $status = Action::NOTICE_OK, $vars = array(), $log = array()) + protected function addNotice($type, $id, $name, $text, $status = Action::NOTICE_OK, $vars = array(), $log = array()) { if ($status === true) $status = Action::NOTICE_OK; @@ -274,13 +254,15 @@ class Action if (!is_array($vars)) $vars = array($vars); - $this->templateVars['notices'][] = array('type' => $type, - 'name' => $name, - 'key' => $text, - 'vars' => $vars, - 'text' => \cms\base\Language::lang($text, $vars), - 'log' => $log, - 'status' => $status); + $this->templateVars['notices'][] = [ + 'type' => $type, + 'id' => $id , + 'name' => $name, + 'key' => $text, + 'vars' => $vars, + 'text' => L::lang($text, $vars), + 'log' => $log , + 'status' => $status]; } @@ -419,15 +401,6 @@ class Action } - /** - * Erzeugt einen Redirect auf einen bestimmte URL. - */ - protected function redirect($url) - { - $this->setControlVar('redirect', $url); - } - - protected function setCookie($name,$value='' ) { if (empty($value)) diff --git a/modules/cms/action/ElementAction.class.php b/modules/cms/action/ElementAction.class.php @@ -76,13 +76,13 @@ class ElementAction extends BaseAction { // Nur Inhalte löschen $this->element->deleteValues(); - $this->addNotice('element',$this->element->name,'DELETED',Action::NOTICE_OK); + $this->addNotice('element', 0, $this->element->name, 'DELETED', Action::NOTICE_OK); } elseif ( $type == 'all' ) { // Element löschen $this->element->delete(); - $this->addNotice('element',$this->element->name,'DELETED',Action::NOTICE_OK); + $this->addNotice('element', 0, $this->element->name, 'DELETED', Action::NOTICE_OK); } } @@ -139,7 +139,7 @@ class ElementAction extends BaseAction $this->element->code = $this->getRequestVar('parameters',RequestParams::FILTER_RAW); $this->element->save(); - $this->addNotice('element',$this->element->name,'SAVED'); + $this->addNotice('element', 0, $this->element->name, 'SAVED'); } @@ -456,7 +456,7 @@ class ElementAction extends BaseAction case Element::ELEMENT_TYPE_CODE: if ( $conf['security']['disable_dynamic_code'] ) - $this->addNotice('element',$this->element->name,'CODE_DISABLED',Action::NOTICE_WARN); + $this->addNotice('element', 0, $this->element->name, 'CODE_DISABLED', Action::NOTICE_WARN); $this->setTemplateVar('code',$this->element->code); break; @@ -614,7 +614,7 @@ class ElementAction extends BaseAction $this->element->save(); - $this->addNotice('element',$this->element->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('element', 0, $this->element->name, 'SAVED', Action::NOTICE_OK); } } diff --git a/modules/cms/action/FileAction.class.php b/modules/cms/action/FileAction.class.php @@ -121,7 +121,7 @@ class FileAction extends ObjectAction $this->file->setTimestamp(); - $this->addNotice($this->file->getType(),$this->file->filename,'VALUE_SAVED','ok'); + $this->addNotice($this->file->getType(), 0, $this->file->filename, 'VALUE_SAVED', 'ok'); } @@ -142,7 +142,7 @@ class FileAction extends ObjectAction $this->file->updateType(); $this->file->save(); - $this->addNotice($this->file->getType(),$this->file->filename,'PROP_SAVED','ok'); + $this->addNotice($this->file->getType(), 0, $this->file->filename, 'PROP_SAVED', 'ok'); } @@ -373,7 +373,7 @@ class FileAction extends ObjectAction throw new \util\exception\UIException('','cannot uncompress file with extension: ' . $this->file->extension ); } - $this->addNotice('file',$this->file->name,'DONE',Action::NOTICE_OK); + $this->addNotice('file', 0, $this->file->name, 'DONE', Action::NOTICE_OK); $this->callSubAction('edit'); } @@ -406,7 +406,7 @@ class FileAction extends ObjectAction $newFile->lastchangeDate = $file['time']; $newFile->add(); - $this->addNotice('file',$newFile->name,'ADDED'); + $this->addNotice('file', 0, $newFile->name, 'ADDED'); } unset($tar); @@ -439,7 +439,7 @@ class FileAction extends ObjectAction $newFile->value = $zip->unzip($fileName); $newFile->add(); - $this->addNotice('file',$newFile->name,'ADDED'); + $this->addNotice('file', 0, $newFile->name, 'ADDED'); unset($newFile); } @@ -524,7 +524,7 @@ class FileAction extends ObjectAction throw new \util\exception\UIException('unknown compress type: ' . $format ); } - $this->addNotice('file',$this->file->name,'DONE',Action::NOTICE_OK); + $this->addNotice('file', 0, $this->file->name, 'DONE', Action::NOTICE_OK); $this->callSubAction('edit'); } @@ -582,11 +582,11 @@ class FileAction extends ObjectAction if ( $this->getRequestVar('delete') != '' ) { $this->file->delete(); - $this->addNotice('template',$this->file->filename,'DELETED',Action::NOTICE_OK); + $this->addNotice('template', 0, $this->file->filename, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice('template',$this->file->filename,'CANCELED',Action::NOTICE_WARN); + $this->addNotice('template', 0, $this->file->filename, 'CANCELED', Action::NOTICE_WARN); } } } diff --git a/modules/cms/action/FolderAction.class.php b/modules/cms/action/FolderAction.class.php @@ -25,6 +25,7 @@ use cms\model\Link; use cms\model\Text; use cms\model\Url; use cms\generator\PublishPublic; +use util\exception\ValidationException; use util\Http; use Publish; use util\Session; @@ -72,36 +73,26 @@ class FolderAction extends ObjectAction } - public function createfolderPost() + public function createfolderPost( $name ) { - $name = $this->getRequestVar('name' ); $description = $this->getRequestVar('description'); - if ( !empty($name) ) - { - $f = new Folder(); - $f->projectid = $this->folder->projectid; - $f->languageid = $this->folder->languageid; - $f->name = $name; - $f->filename = BaseObject::urlify( $name ); - $f->desc = $description; - $f->parentid = $this->folder->objectid; - - $f->add(); - $f->setNameForAllLanguages( $name,$description ); + $f = new Folder(); + $f->projectid = $this->folder->projectid; + $f->languageid = $this->folder->languageid; + $f->name = $name; + $f->filename = BaseObject::urlify( $name ); + $f->desc = $description; + $f->parentid = $this->folder->objectid; - $this->addNotice('folder',$f->name,'ADDED','ok'); + $f->add(); + $f->setNameForAllLanguages( $name,$description ); - // Die neue Folder-Id (wichtig für API-Aufrufe). - $this->setTemplateVar('objectid',$f->objectid); - - $this->folder->setTimestamp(); // Zeitstempel setzen. - } - else - { - $this->addValidationError('name'); - } + $this->addNoticeFor($f, Messages::ADDED); + // Die neue Folder-Id (wichtig für API-Aufrufe). + $this->setTemplateVar('objectid',$f->objectid); + $this->folder->setTimestamp(); // Zeitstempel setzen. } @@ -127,7 +118,6 @@ class FolderAction extends ObjectAction if ( !$ok ) { $this->addValidationError('url','COMMON_VALIDATION_ERROR',array(),$http->error); - $this->callSubAction('createfile'); return; } @@ -179,7 +169,7 @@ class FolderAction extends ObjectAction $file->add(); // Datei hinzufuegen $file->setNameForAllLanguages( $name,$description ); - $this->addNotice('file',$file->filename,'ADDED','ok'); + $this->addNoticeFor( $file, Messages::ADDED ); $this->setTemplateVar('objectid',$file->objectid); $this->folder->setTimestamp(); @@ -208,7 +198,6 @@ class FolderAction extends ObjectAction if ( !$ok ) { $this->addValidationError('url','COMMON_VALIDATION_ERROR',array(),$http->error); - $this->callSubAction('createfile'); return; } @@ -247,7 +236,7 @@ class FolderAction extends ObjectAction } $image->add(); // Datei hinzufuegen - $this->addNotice('file',$image->name,'ADDED','ok'); + $this->addNoticeFor( $image, Messages::ADDED ); $image->setNameForAllLanguages( $name,$description ); $this->setTemplateVar('objectid',$image->objectid); @@ -313,7 +302,7 @@ class FolderAction extends ObjectAction $text->add(); // Datei hinzufuegen $text->setNameForAllLanguages( $name,$description ); - $this->addNotice('file',$text->name,'ADDED','ok'); + $this->addNoticeFor($text, Messages::ADDED); $this->setTemplateVar('objectid',$text->objectid); $this->folder->setTimestamp(); @@ -321,99 +310,66 @@ class FolderAction extends ObjectAction - public function createlinkPost() + public function createlinkPost( $name ) { - $name = $this->getRequestVar('name' ); $description = $this->getRequestVar('description'); - if ( !empty($name) ) - { - $link = new Link(); - $link->filename = BaseObject::urlify( $name ); - $link->parentid = $this->folder->objectid; + $link = new Link(); + $link->filename = BaseObject::urlify( $name ); + $link->parentid = $this->folder->objectid; - $link->linkedObjectId = $this->getRequestVar('targetobjectid'); - $link->projectid = $this->folder->projectid; + $link->linkedObjectId = $this->getRequestVar('targetobjectid'); + $link->projectid = $this->folder->projectid; - $link->add(); - $link->setNameForAllLanguages( $name,$description ); + $link->add(); + $link->setNameForAllLanguages( $name,$description ); - $this->addNotice('link',$link->name,'ADDED','ok'); - $this->setTemplateVar('objectid',$link->objectid); - } - else - { - $this->addValidationError('name'); - $this->callSubAction('createlink'); - return; - } + $this->addNoticeFor( $link, Messages::ADDED); + $this->setTemplateVar('objectid',$link->objectid); $this->folder->setTimestamp(); } - public function createurlPost() + public function createurlPost( $name ) { - $name = $this->getRequestVar('name' ); $description = $this->getRequestVar('description'); $filename = $this->getRequestVar('filename' ); - if ( !empty($name) ) - { - $url = new Url(); - $url->filename = BaseObject::urlify( $name ); - $url->parentid = $this->folder->objectid; - $url->projectid = $this->folder->projectid; + $url = new Url(); + $url->filename = BaseObject::urlify( $name ); + $url->parentid = $this->folder->objectid; + $url->projectid = $this->folder->projectid; - $url->url = $this->getRequestVar('url'); + $url->url = $this->getRequestVar('url'); - $url->add(); - $url->setNameForAllLanguages( $name,$description ); + $url->add(); + $url->setNameForAllLanguages( $name,$description ); - $this->addNotice('url',$url->name,'ADDED','ok'); - $this->setTemplateVar('objectid',$url->objectid); - } - else - { - $this->addValidationError('name'); - $this->callSubAction('createurl'); - return; - } + $this->addNoticeFor( $url, Messages::ADDED ); + $this->setTemplateVar('objectid',$url->objectid); $this->folder->setTimestamp(); } - public function createpagePost() + public function createpagePost( $name ) { - $type = $this->getRequestVar('type' ); - $name = $this->getRequestVar('name' ); $filename = $this->getRequestVar('filename' ); $description = $this->getRequestVar('description'); - if ( $this->getRequestVar('name') != '' ) - { - $page = new Page(); - $page->name = $name; - $page->desc = $description; - $page->filename = BaseObject::urlify( $name ); - $page->templateid = $this->getRequestVar('templateid'); - $page->parentid = $this->folder->objectid; - $page->projectid = $this->folder->projectid; + $page = new Page(); + $page->filename = BaseObject::urlify( $name ); + $page->templateid = $this->getRequestVar('templateid'); + $page->parentid = $this->folder->objectid; + $page->projectid = $this->folder->projectid; - $page->add(); - $page->setNameForAllLanguages( $name,$description ); + $page->add(); + $page->setNameForAllLanguages( $name,$description ); - $this->addNotice('page',$page->name,'ADDED','ok'); - $this->setTemplateVar('objectid',$page->objectid); - } - else - { - $this->addValidationError('name'); - $this->callSubAction('createpage'); - return; - } + $this->addNoticeFor( $page, Messages::ADDED ); + $this->setTemplateVar('objectid',$page->objectid); $this->folder->setTimestamp(); } @@ -444,90 +400,11 @@ class FolderAction extends ObjectAction unset( $o ); // Selfmade Garbage Collection :-) } - $this->addNotice($this->folder->getType(),$this->folder->name,'SEQUENCE_CHANGED','ok'); + $this->addNoticeFor($this->folder, Messages::SEQUENCE_CHANGED); $this->folder->setTimestamp(); } - private function OLD__________editPost() - { - $type = $this->getRequestVar('type'); // Typ der Aktion, z.B "copy" oder "move" - - switch( $type ) - { - case 'move': - case 'copy': - case 'link': - // Liste von m�glichen Zielordnern anzeigen - - $otherfolder = array(); - foreach( $this->folder->getAllFolders() as $id ) - { - $f = new Folder( $id ); - - // Beim Verkn�pfen muss im Zielordner die Berechtigung zum Erstellen - // von Verkn�pfungen vorhanden sein. - // - // Beim Verschieben und Kopieren muss im Zielordner die Berechtigung - // zum Erstellen von Ordner, Dateien oder Seiten vorhanden sein. - if ( ( $type=='link' && $f->hasRight( Acl::ACL_CREATE_LINK ) ) || - ( ( $type=='move' || $type == 'copy' ) && - ( $f->hasRight(Acl::ACL_CREATE_FOLDER) || $f->hasRight(Acl::ACL_CREATE_FILE) || $f->hasRight(Acl::ACL_CREATE_PAGE) ) ) ) - // Zielordner hinzuf�gen - $otherfolder[$id] = FILE_SEP.implode( FILE_SEP,$f->parentObjectNames(false,true) ); - } - - // Zielordner-Liste alphabetisch sortieren - asort( $otherfolder ); - - $this->setTemplateVar('folder',$otherfolder); - - break; - - case 'archive': - $this->setTemplateVar('ask_filename',''); - break; - - case 'delete': - $this->setTemplateVar('ask_commit',''); - break; - - default: - $this->addValidationError('type'); - return; - - } // switch - - $ids = $this->folder->getObjectIds(); - $objectList = array(); - - foreach( $ids as $id ) - { - // Nur, wenn Objekt ausgewaehlt wurde - if ( !$this->hasRequestVar('obj'.$id) ) - continue; - - $o = new BaseObject( $id ); - $o->load(); - - // F�r die gew�nschte Aktion m�ssen pro Objekt die entsprechenden Rechte - // vorhanden sein. - if ( $type == 'copy' && $o->hasRight( Acl::ACL_READ ) || - $type == 'move' && $o->hasRight( Acl::ACL_DELETE ) || - $type == 'link' && $o->hasRight( Acl::ACL_READ ) || - $type == 'archive' && $o->hasRight( Acl::ACL_READ ) || - $type == 'delete' && $o->hasRight( Acl::ACL_DELETE ) ) - $objectList[ $id ] = $o->getProperties(); - } - - $this->setTemplateVar('type' ,$type ); - $this->setTemplateVar('objectlist',$objectList ); - - // Komma-separierte Liste von ausgew�hlten Objekt-Ids erzeugen - $this->setTemplateVar('ids',join(array_keys($objectList),',') ); - } - - /** * Verschieben/Kopieren/Loeschen/Verknuepfen von mehreren Dateien in diesem Ordner @@ -589,7 +466,7 @@ class FolderAction extends ObjectAction $type == 'delete' && $o->hasRight( Acl::ACL_DELETE ) ) $objectList[ $id ] = $o->getProperties(); else - $this->addNotice($o->getType(),$o->name,'no_rights',Action::NOTICE_WARN); + $this->addNotice($o->getType(), 0, $o->name, 'no_rights', Action::NOTICE_WARN); } $ids = array_keys($objectList); @@ -628,7 +505,7 @@ class FolderAction extends ObjectAction else { // Was anderes als Dateien ignorieren. - $this->addNotice($o->getType(),$o->name,'NOTHING_DONE',Action::NOTICE_WARN); + $this->addNotice($o->getType(), 0, $o->name, 'NOTHING_DONE', Action::NOTICE_WARN); } } @@ -668,18 +545,18 @@ class FolderAction extends ObjectAction // dann verschieben if ( !in_array($targetObjectId,$allsubfolders) && $id != $targetObjectId ) { - $this->addNotice($o->getType(),$o->name,'MOVED','ok'); + $this->addNotice($o->getType(), 0, $o->name, 'MOVED', 'ok'); $o->setParentId( $targetObjectId ); } else { - $this->addNotice($o->getType(),$o->name,'ERROR','error'); + $this->addNotice($o->getType(), 0, $o->name, 'ERROR', 'error'); } } else { $o->setParentId( $targetObjectId ); - $this->addNotice($o->getType(),$o->name,'MOVED','ok'); + $this->addNotice($o->getType(), 0, $o->name, 'MOVED', 'ok'); } break; @@ -689,7 +566,7 @@ class FolderAction extends ObjectAction case 'folder': // Ordner zur Zeit nicht kopieren // Funktion waere zu verwirrend - $this->addNotice($o->getType(),$o->name,'CANNOT_COPY_FOLDER','error'); + $this->addNotice($o->getType(), 0, $o->name, 'CANNOT_COPY_FOLDER', 'error'); break; case 'file': @@ -701,7 +578,7 @@ class FolderAction extends ObjectAction $f->add(); $f->copyValueFromFile( $id ); - $this->addNotice($o->getType(),$o->name,'COPIED','ok'); + $this->addNotice($o->getType(), 0, $o->name, 'COPIED', 'ok'); break; case 'page': @@ -712,7 +589,7 @@ class FolderAction extends ObjectAction $p->parentid = $targetObjectId; $p->add(); $p->copyValuesFromPage( $id ); - $this->addNotice($o->getType(),$o->name,'COPIED','ok'); + $this->addNotice($o->getType(), 0, $o->name, 'COPIED', 'ok'); break; case 'link': @@ -722,7 +599,7 @@ class FolderAction extends ObjectAction $l->name = \cms\base\Language::lang('COPY_OF').' '.$l->name; $l->parentid = $targetObjectId; $l->add(); - $this->addNotice($o->getType(),$o->name,'COPIED','ok'); + $this->addNotice($o->getType(), 0, $o->name, 'COPIED', 'ok'); break; default: @@ -745,11 +622,11 @@ class FolderAction extends ObjectAction $link->isLinkToObject = true; $link->name = \cms\base\Language::lang('LINK_TO').' '.$o->name; $link->add(); - $this->addNotice($o->getType(),$o->name,'LINKED','ok'); + $this->addNotice($o->getType(), 0, $o->name, 'LINKED', 'ok'); } else { - $this->addNotice($o->getType(),$o->name,'ERROR','error'); + $this->addNotice($o->getType(), 0, $o->name, 'ERROR', 'error'); } break; @@ -788,17 +665,17 @@ class FolderAction extends ObjectAction default: throw new \LogicException("Error while deleting: Unknown type: {$o->getType()}"); } - $this->addNotice($o->getType(),$o->name,'DELETED',Action::NOTICE_OK); + $this->addNotice($o->getType(), 0, $o->name, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice($o->getType(),$o->name,'NOTHING_DONE',Action::NOTICE_WARN); + $this->addNotice($o->getType(), 0, $o->name, 'NOTHING_DONE', Action::NOTICE_WARN); } break; default: - $this->addNotice($o->getType(),$o->name,'ERROR','error'); + $this->addNotice($o->getType(), 0, $o->name, 'ERROR', 'error'); } } @@ -978,7 +855,7 @@ class FolderAction extends ObjectAction $this->setTemplateVar('objectid' ,$this->folder->objectid ); if ( count($all_templates) == 0 ) - $this->addNotice('folder',$this->folder->name,'NO_TEMPLATES_AVAILABLE',Action::NOTICE_WARN); + $this->addNotice('folder', 0, $this->folder->name, 'NO_TEMPLATES_AVAILABLE', Action::NOTICE_WARN); } diff --git a/modules/cms/action/GroupAction.class.php b/modules/cms/action/GroupAction.class.php @@ -66,11 +66,11 @@ class GroupAction extends BaseAction { $this->group->delete(); - $this->addNotice('group',$this->group->name,'DELETED',Action::NOTICE_OK); + $this->addNotice('group', 0, $this->group->name, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice('group',$this->group->name,'NOTHING_DONE',Action::NOTICE_WARN); + $this->addNotice('group', 0, $this->group->name, 'NOTHING_DONE', Action::NOTICE_WARN); } } @@ -91,7 +91,7 @@ class GroupAction extends BaseAction $this->group->name = $this->getRequestVar('name'); $this->group->save(); - $this->addNotice('group',$this->group->name,'SAVED','ok'); + $this->addNotice('group', 0, $this->group->name, 'SAVED', 'ok'); } @@ -116,18 +116,18 @@ class GroupAction extends BaseAction { $this->group->addUser( $uid ); } - $this->addNotice('group',$this->group->name,'USER_ADDED_TO_GROUP',Action::NOTICE_OK,array('count'=>count($userid))); + $this->addNotice('group', 0, $this->group->name, 'USER_ADDED_TO_GROUP', Action::NOTICE_OK, array('count' => count($userid))); } elseif( intval($userid) > 0 ) { // Nur 1 Benutzer hinzuf�gen. $this->group->addUser( intval($userid) ); - $this->addNotice('group',$this->group->name,'USER_ADDED_TO_GROUP',OK_NOTICE_OK,array('count'=>'1')); + $this->addNotice('group', 0, $this->group->name, 'USER_ADDED_TO_GROUP', OK_NOTICE_OK, array('count' => '1')); } else { // Es wurde kein Benutzer ausgew�hlt. - $this->addNotice('group',$this->group->name,'NOTHING_DONE',Action::NOTICE_WARN); + $this->addNotice('group', 0, $this->group->name, 'NOTHING_DONE', Action::NOTICE_WARN); } } @@ -140,7 +140,7 @@ class GroupAction extends BaseAction { $this->group->delUser( intval($this->getRequestVar('userid')) ); - $this->addNotice('group',$this->group->name,'DELETED',Action::NOTICE_OK); + $this->addNotice('group', 0, $this->group->name, 'DELETED', Action::NOTICE_OK); } @@ -209,7 +209,7 @@ class GroupAction extends BaseAction $conf = \cms\base\Configuration::rawConfig(); if ($conf['security']['authorize']['type']=='ldap') - $this->addNotice('group',$this->group->name,'GROUPS_MAY_CONFLICT_WITH_LDAP',Action::NOTICE_WARN); + $this->addNotice('group', 0, $this->group->name, 'GROUPS_MAY_CONFLICT_WITH_LDAP', Action::NOTICE_WARN); } @@ -225,13 +225,13 @@ class GroupAction extends BaseAction if ( !$hasUser && $this->hasRequestVar('user'.$id) ) { $this->group->addUser($id); - $this->addNotice('user',$name,'ADDED'); + $this->addNotice('user', 0, $name, 'ADDED'); } if ( $hasUser && !$this->hasRequestVar('user'.$id) ) { $this->group->delUser($id); - $this->addNotice('user',$name,'DELETED'); + $this->addNotice('user', 0, $name, 'DELETED'); } } } diff --git a/modules/cms/action/GrouplistAction.class.php b/modules/cms/action/GrouplistAction.class.php @@ -76,7 +76,7 @@ class GrouplistAction extends BaseAction $this->group = new Group(); $this->group->name = $this->getRequestVar('name'); $this->group->add(); - $this->addNotice('group',$this->group->name,'ADDED','ok'); + $this->addNotice('group', 0, $this->group->name, 'ADDED', 'ok'); $this->callSubAction('listing'); } else diff --git a/modules/cms/action/ImageAction.class.php b/modules/cms/action/ImageAction.class.php @@ -62,13 +62,13 @@ class ImageAction extends FileAction if ( $format == 0 ) { - $this->addNotice( 'image','','IMAGE_RESIZING_UNKNOWN_TYPE',Action::NOTICE_WARN); + $this->addNotice('image', 0, '', 'IMAGE_RESIZING_UNKNOWN_TYPE', Action::NOTICE_WARN); } $formats = $this->imageFormats(); if ( empty($formats) ) - $this->addNotice( 'image','','IMAGE_RESIZING_NOT_AVAILABLE',Action::NOTICE_WARN); + $this->addNotice('image', 0, '', 'IMAGE_RESIZING_NOT_AVAILABLE', Action::NOTICE_WARN); $sizes = array(); foreach( array(10,25,50,75,100,125,150,175,200,250,300,350,400,500,600,800) as $s ) @@ -147,7 +147,7 @@ class ImageAction extends FileAction $imageFile->save(); // Um z.B. Groesse abzuspeichern $imageFile->saveValue(); - $this->addNotice($imageFile->getType(),$imageFile->name,'IMAGE_RESIZED','ok'); + $this->addNotice($imageFile->getType(), 0, $imageFile->name, 'IMAGE_RESIZED', 'ok'); } diff --git a/modules/cms/action/LanguageAction.class.php b/modules/cms/action/LanguageAction.class.php @@ -67,7 +67,7 @@ class LanguageAction extends BaseAction { $this->language->setDefault(); - $this->addNotice('language',$this->language->name,'DONE',Action::NOTICE_OK); + $this->addNotice('language', 0, $this->language->name, 'DONE', Action::NOTICE_OK); } @@ -114,7 +114,7 @@ class LanguageAction extends BaseAction $this->language->save(); - $this->addNotice('language',$this->language->name,'DONE',Action::NOTICE_OK); + $this->addNotice('language', 0, $this->language->name, 'DONE', Action::NOTICE_OK); } diff --git a/modules/cms/action/LanguagelistAction.class.php b/modules/cms/action/LanguagelistAction.class.php @@ -139,7 +139,7 @@ class LanguagelistAction extends BaseAction $language->name = $countryList[$iso]; $language->add(); - $this->addNotice('language',$language->name,'ADDED','ok'); + $this->addNotice('language', 0, $language->name, 'ADDED', 'ok'); } diff --git a/modules/cms/action/LinkAction.class.php b/modules/cms/action/LinkAction.class.php @@ -79,7 +79,7 @@ class LinkAction extends ObjectAction $this->link->linkedObjectId = $this->getRequestVar('targetobjectid'); $this->link->save(); - $this->addNotice('link',$this->link->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('link', 0, $this->link->name, 'SAVED', Action::NOTICE_OK); } @@ -108,9 +108,9 @@ class LinkAction extends ObjectAction { if ($this->getRequestVar('delete') != '') { $this->link->delete(); - $this->addNotice('link', $this->link->filename, 'DELETED', Action::NOTICE_OK); + $this->addNotice('link', 0, $this->link->filename, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice('link', $this->link->filename, 'CANCELED', Action::NOTICE_WARN); + $this->addNotice('link', 0, $this->link->filename, 'CANCELED', Action::NOTICE_WARN); } } diff --git a/modules/cms/action/LoginAction.class.php b/modules/cms/action/LoginAction.class.php @@ -80,14 +80,14 @@ class LoginAction extends BaseAction if ( !is_object($db) ) { - $this->addNotice('database','','DATABASE_CONNECTION_ERROR',Action::NOTICE_ERROR,array(),array('no connection')); + $this->addNotice('database', 0, '', 'DATABASE_CONNECTION_ERROR', Action::NOTICE_ERROR, array(), array('no connection')); //$this->callSubAction('showlogin'); return false; } if ( !$db->available ) { - $this->addNotice('database',$db->conf['description'],'DATABASE_CONNECTION_ERROR',Action::NOTICE_ERROR,array(),array('Database Error: '.$db->error)); + $this->addNotice('database', 0, $db->conf['description'], 'DATABASE_CONNECTION_ERROR', Action::NOTICE_ERROR, array(), array('Database Error: ' . $db->error)); //$this->callSubAction('showlogin'); return false; } @@ -289,7 +289,7 @@ class LoginAction extends BaseAction if ( empty($dbids) ) - $this->addNotice('','','no_database_configuration',Action::NOTICE_WARN); + $this->addNotice('', 0, '', 'no_database_configuration', Action::NOTICE_WARN); if ( !isset($this->templateVars['login_name']) && isset($_COOKIE['or_username']) ) $this->setTemplateVar('login_name',$_COOKIE['or_username']); @@ -387,7 +387,7 @@ class LoginAction extends BaseAction if ( empty($dbids) ) - $this->addNotice('','','no_database_configuration',Action::NOTICE_WARN); + $this->addNotice('', 0, '', 'no_database_configuration', Action::NOTICE_WARN); if ( !isset($_COOKIE['or_username']) ) $this->setTemplateVar('login_name',$_COOKIE['or_username']); @@ -525,8 +525,6 @@ class LoginAction extends BaseAction Logger::info("User login successful: ".$username); $user->setCurrent(); // Benutzer ist jetzt in der Sitzung. - $this->setStyle( $user->style ); - $server = Http::getServer(); Logger::debug("Redirecting to $server"); header('Location: '.FileUtils::slashify($server) ); @@ -562,14 +560,14 @@ class LoginAction extends BaseAction if ( ! $openId->login() ) { - $this->addNotice('user',$openid_user,'LOGIN_OPENID_FAILED','error',array('name'=>$openid_user),array($openId->error) ); + $this->addNotice('user', 0, $openid_user, 'LOGIN_OPENID_FAILED', 'error', array('name' => $openid_user), array($openId->error)); $this->addValidationError('openid_url',''); $this->callSubAction('showlogin'); return; } Session::set('openid',$openId); - $this->redirect( $openId->getRedirectUrl() ); + //$this->redirect( $openId->getRedirectUrl() ); return; } } @@ -678,7 +676,7 @@ class LoginAction extends BaseAction else { // Anmeldung gescheitert. - $this->addNotice('user',$loginName,'LOGIN_FAILED','error',array('name'=>$loginName) ); + $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED', 'error', array('name' => $loginName)); $this->addValidationError('login_name' ,''); $this->addValidationError('login_password',''); return; @@ -783,20 +781,20 @@ class LoginAction extends BaseAction if ( $tokenFailed ) { // Token falsch. - $this->addNotice('user',$loginName,'LOGIN_FAILED_TOKEN_FAILED','error' ); + $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED_TOKEN_FAILED', 'error'); $this->addValidationError('user_token',''); } elseif ( $mustChangePassword ) { // Anmeldung gescheitert, Benutzer muss Kennwort ?ndern. - $this->addNotice('user',$loginName,'LOGIN_FAILED_MUSTCHANGEPASSWORD','error' ); + $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED_MUSTCHANGEPASSWORD', 'error'); $this->addValidationError('password1',''); $this->addValidationError('password2',''); } else { // Anmeldung gescheitert. - $this->addNotice('user',$loginName,'LOGIN_FAILED','error',array('name'=>$loginName) ); + $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED', 'error', array('name' => $loginName)); $this->addValidationError('login_name' ,''); $this->addValidationError('login_password',''); } @@ -821,10 +819,8 @@ class LoginAction extends BaseAction if ( \cms\base\Configuration::config()->subset('security')->is('renew_session_login',false) ) $this->recreateSession(); - $this->addNotice('user',$user->name,'LOGIN_OK',Action::NOTICE_OK,array('name'=>$user->fullname)); + $this->addNotice('user', 0, $user->name, 'LOGIN_OK', Action::NOTICE_OK, array('name' => $user->fullname)); - $this->setStyle( $user->style ); // Benutzer-Style setzen - $config = Session::getConfig(); $language = new \language\Language(); $config['language'] = $language->getLanguage($user->language); @@ -886,19 +882,7 @@ class LoginAction extends BaseAction //session_unset(); Session::setUser(null); - // Umleiten auf eine definierte URL.s - $redirect_url = @$conf['security']['logout']['redirect_url']; - - if ( !empty($redirect_url) ) - { - $this->redirect($redirect_url); - } - - // Style zurücksetzen. - // Der Style des Benutzers koennte auch stehen bleiben. Aber dann gäbe es Rückschlüsse darauf, wer zuletzt angemeldet war (Sicherheit!). - $this->setStyle( \cms\base\Configuration::config('interface','style','default') ); - - $this->addNotice('user',$user->name,'LOGOUT_OK',Action::NOTICE_OK); + $this->addNotice('user', 0, $user->name, 'LOGOUT_OK', Action::NOTICE_OK); } @@ -1070,7 +1054,7 @@ class LoginAction extends BaseAction else { Logger::warn('Guest login failed, user not found: '.$username); - $this->addNotice('user',$username,'LOGIN_FAILED',Action::NOTICE_WARN,array('name'=>$username) ); + $this->addNotice('user', 0, $username, 'LOGIN_FAILED', Action::NOTICE_WARN, array('name' => $username)); $user = null; } } @@ -1113,7 +1097,7 @@ class LoginAction extends BaseAction if ( $user->mustChangePassword ) { - $this->addNotice( 'user',$user->name,'PASSWORD_TIMEOUT','warn' ); + $this->addNotice('user', 0, $user->name, 'PASSWORD_TIMEOUT', 'warn'); $this->callSubAction( 'changepassword' ); // Zwang, das Kennwort zu ?ndern. } @@ -1186,11 +1170,11 @@ class LoginAction extends BaseAction if ( $mail->send() ) { - $this->addNotice('','','mail_sent',Action::NOTICE_OK); + $this->addNotice('', 0, '', 'mail_sent', Action::NOTICE_OK); } else { - $this->addNotice('','','mail_not_sent',Action::NOTICE_ERROR,array(),$mail->error); + $this->addNotice('', 0, '', 'mail_not_sent', Action::NOTICE_ERROR, array(), $mail->error); return; } } @@ -1245,7 +1229,7 @@ class LoginAction extends BaseAction $newUser->setPassword( $this->getRequestVar('password'),true ); - $this->addNotice('user',$newUser->name,'user_added','ok'); + $this->addNotice('user', 0, $newUser->name, 'user_added', 'ok'); } @@ -1300,9 +1284,9 @@ class LoginAction extends BaseAction $eMail->setVar('name',$user->getName()); $eMail->setVar('code',$code); if ( $eMail->send() ) - $this->addNotice('user',$user->getName(),'mail_sent',Action::NOTICE_OK); + $this->addNotice('user', 0, $user->getName(), 'mail_sent', Action::NOTICE_OK); else - $this->addNotice('user',$user->getName(),'mail_not_sent',Action::NOTICE_ERROR,array(),$eMail->error); + $this->addNotice('user', 0, $user->getName(), 'mail_not_sent', Action::NOTICE_ERROR, array(), $eMail->error); } else @@ -1311,7 +1295,7 @@ class LoginAction extends BaseAction // Trotzdem vort?uschen, eine E-Mail zu senden, damit die G?ltigkeit // eines Benutzernamens nicht von au?en gepr?ft werden kann. // - $this->addNotice('user',$this->getRequestVar("username"),'mail_sent'); + $this->addNotice('user', 0, $this->getRequestVar("username"), 'mail_sent'); } @@ -1349,7 +1333,7 @@ class LoginAction extends BaseAction if ( !$user->isValid() ) { // Benutzer konnte nicht geladen werden. - $this->addNotice('user',$username,'error',Action::NOTICE_ERROR); + $this->addNotice('user', 0, $username, 'error', Action::NOTICE_ERROR); return; } @@ -1362,13 +1346,13 @@ class LoginAction extends BaseAction if ( $eMail->send() ) { $user->setPassword( $newPw, false ); // Kennwort muss beim n?. Login ge?ndert werden. - $this->addNotice('user',$username,'mail_sent',Action::NOTICE_OK); + $this->addNotice('user', 0, $username, 'mail_sent', Action::NOTICE_OK); } else { // Sollte eigentlich nicht vorkommen, da der Benutzer ja auch schon den // Code per E-Mail erhalten hat. - $this->addNotice('user',$username,'error',Action::NOTICE_ERROR,array(),$eMail->error); + $this->addNotice('user', 0, $username, 'error', Action::NOTICE_ERROR, array(), $eMail->error); } } diff --git a/modules/cms/action/ModelAction.class.php b/modules/cms/action/ModelAction.class.php @@ -79,7 +79,7 @@ class ModelAction extends BaseAction if ( $this->hasRequestVar('is_default') ) $this->model->setDefault(); - $this->addNotice('model',$this->model->name,'DONE',Action::NOTICE_OK); + $this->addNotice('model', 0, $this->model->name, 'DONE', Action::NOTICE_OK); } @@ -103,11 +103,11 @@ class ModelAction extends BaseAction if ( $this->hasRequestVar('confirm') ) { $this->model->delete(); - $this->addNotice('model',$this->model->name,'DONE',Action::NOTICE_OK); + $this->addNotice('model', 0, $this->model->name, 'DONE', Action::NOTICE_OK); } else { - $this->addNotice('model',$this->model->name,'NOTHING_DONE',Action::NOTICE_WARN); + $this->addNotice('model', 0, $this->model->name, 'NOTHING_DONE', Action::NOTICE_WARN); } } @@ -119,7 +119,7 @@ class ModelAction extends BaseAction $this->model->setDefault(); - $this->addNotice('model',$this->model->name,'DONE',Action::NOTICE_OK); + $this->addNotice('model', 0, $this->model->name, 'DONE', Action::NOTICE_OK); } diff --git a/modules/cms/action/ObjectAction.class.php b/modules/cms/action/ObjectAction.class.php @@ -73,7 +73,7 @@ class ObjectAction extends BaseAction if ( ! $targetFolder->hasRight(Acl::ACL_WRITE) ) { - $this->addNotice('folder', $targetFolder->name, 'NOT_WRITABLE',Action::NOTICE_ERROR); + $this->addNotice('folder', 0, $targetFolder->name, 'NOT_WRITABLE', Action::NOTICE_ERROR); } } @@ -96,7 +96,7 @@ class ObjectAction extends BaseAction // Prüfen, ob Schreibrechte im Zielordner bestehen. if ( ! $targetFolder->hasRight(Acl::ACL_WRITE) ) { - $this->addNotice('folder', $targetFolder->name, 'NOT_WRITABLE',Action::NOTICE_ERROR); + $this->addNotice('folder', 0, $targetFolder->name, 'NOT_WRITABLE', Action::NOTICE_ERROR); return; } @@ -118,7 +118,7 @@ class ObjectAction extends BaseAction // dann verschieben if ( in_array($targetObjectId,$allsubfolders) || $sourceObjectId == $targetObjectId ) { - $this->addNotice('folder',$sourceObject->name,'ERROR',Action::NOTICE_ERROR); + $this->addNotice('folder', 0, $sourceObject->name, 'ERROR', Action::NOTICE_ERROR); return; } } @@ -127,7 +127,7 @@ class ObjectAction extends BaseAction // Beim Verschieben und Kopieren muss im Zielordner die Berechtigung // zum Erstellen von Ordner, Dateien oder Seiten vorhanden sein. $sourceObject->setParentId( $targetObjectId ); - $this->addNotice($sourceObject->type, $sourceObject->name, 'moved'); + $this->addNotice($sourceObject->type, 0, $sourceObject->name, 'moved'); break; case 'moveandlink': @@ -135,7 +135,7 @@ class ObjectAction extends BaseAction $oldParentId = $sourceObject->parentid; $sourceObject->setParentId( $targetObjectId ); - $this->addNotice($sourceObject->type, $sourceObject->name, 'moved'); + $this->addNotice($sourceObject->type, 0, $sourceObject->name, 'moved'); $link = new Link(); $link->parentid = $oldParentId; @@ -143,7 +143,7 @@ class ObjectAction extends BaseAction $link->filename = $sourceObject->filename; $link->linkedObjectId = $sourceObjectId; $link->add(); - $this->addNotice('link', $link->name, 'added'); + $this->addNotice('link', 0, $link->name, 'added'); break; @@ -154,7 +154,7 @@ class ObjectAction extends BaseAction case 'folder': // Ordner zur Zeit nicht kopieren // Funktion waere zu verwirrend - $this->addNotice($sourceObject->getType(),$sourceObject->name,'CANNOT_COPY_FOLDER','error'); + $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'CANNOT_COPY_FOLDER', 'error'); break; case 'file': @@ -166,7 +166,7 @@ class ObjectAction extends BaseAction $f->add(); $f->copyValueFromFile( $sourceObjectId ); - $this->addNotice($sourceObject->getType(),$sourceObject->name,'COPIED','ok'); + $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'COPIED', 'ok'); break; case 'page': @@ -177,7 +177,7 @@ class ObjectAction extends BaseAction $p->parentid = $targetObjectId; $p->add(); $p->copyValuesFromPage( $sourceObjectId ); - $this->addNotice($sourceObject->getType(),$sourceObject->name,'COPIED','ok'); + $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'COPIED', 'ok'); break; case 'link': @@ -187,7 +187,7 @@ class ObjectAction extends BaseAction $l->name = \cms\base\Language::lang('COPY_OF').' '.$l->name; $l->parentid = $targetObjectId; $l->add(); - $this->addNotice($sourceObject->getType(),$sourceObject->name,'COPIED','ok'); + $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'COPIED', 'ok'); break; default: @@ -201,7 +201,7 @@ class ObjectAction extends BaseAction // von Verkn�pfungen vorhanden sein. if ( ! $targetFolder->hasRight(Acl::ACL_CREATE_LINK) ) { - $this->addNotice('folder', $targetFolder->name, 'NOT_WRITABLE',Action::NOTICE_ERROR); + $this->addNotice('folder', 0, $targetFolder->name, 'NOT_WRITABLE', Action::NOTICE_ERROR); return; } @@ -212,7 +212,7 @@ class ObjectAction extends BaseAction $link->linkedObjectId = $sourceObjectId; $link->isLinkToObject = true; $link->add(); - $this->addNotice('link', $link->name, 'added'); + $this->addNotice('link', 0, $link->name, 'added'); // OK break; @@ -313,7 +313,7 @@ class ObjectAction extends BaseAction - $this->addNotice('','','ADDED',Action::NOTICE_OK); + $this->addNotice('', 0, '', 'ADDED', Action::NOTICE_OK); $o->setTimestamp(); } @@ -378,7 +378,7 @@ class ObjectAction extends BaseAction if ( ! $this->hasRequestVar('inherit') ) { - $this->addNotice('folder',$folder->name,'NOTHING_DONE',Action::NOTICE_WARN); + $this->addNotice('folder', 0, $folder->name, 'NOTHING_DONE', Action::NOTICE_WARN); return; } @@ -426,7 +426,7 @@ class ObjectAction extends BaseAction } } - $this->addNotice('folder',$folder->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('folder', 0, $folder->name, 'SAVED', Action::NOTICE_OK); } @@ -475,7 +475,7 @@ class ObjectAction extends BaseAction $acl->delete(); // Weg mit der ACL - $this->addNotice('','','DELETED',Action::NOTICE_OK); + $this->addNotice('', 0, '', 'DELETED', Action::NOTICE_OK); } @@ -507,7 +507,7 @@ class ObjectAction extends BaseAction $this->baseObject->setCreationTimestamp(); - $this->addNotice($this->baseObject->getType(),$this->baseObject->filename,'PROP_SAVED','ok'); + $this->addNotice($this->baseObject->getType(), 0, $this->baseObject->filename, 'PROP_SAVED', 'ok'); } @@ -529,7 +529,7 @@ class ObjectAction extends BaseAction $name->save(); - $this->addNotice($this->baseObject->getType(),$this->baseObject->filename,'SAVED','ok'); + $this->addNotice($this->baseObject->getType(), 0, $this->baseObject->filename, 'SAVED', 'ok'); } @@ -607,7 +607,7 @@ class ObjectAction extends BaseAction $this->baseObject->save(); - $this->addNotice($this->baseObject->getType(),$this->baseObject->filename,'SAVED',Action::NOTICE_OK); + $this->addNotice($this->baseObject->getType(), 0, $this->baseObject->filename, 'SAVED', Action::NOTICE_OK); } diff --git a/modules/cms/action/PageAction.class.php b/modules/cms/action/PageAction.class.php @@ -419,12 +419,12 @@ class PageAction extends ObjectAction if ( ! $alias->filename ) { $alias->delete(); - $this->addNotice($alias->getType(),'','DELETED','ok'); + $this->addNotice($alias->getType(), 0, '', 'DELETED', 'ok'); } else { $alias->save(); - $this->addNotice($alias->getType(),$alias->filename,'SAVED','ok'); + $this->addNotice($alias->getType(), 0, $alias->filename, 'SAVED', 'ok'); } } @@ -503,10 +503,10 @@ class PageAction extends ObjectAction if ( $newTemplateId != 0 ) { $this->page->replaceTemplate( $newTemplateId,$replaceElementMap ); - $this->addNotice('page',$this->page->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('page', 0, $this->page->name, 'SAVED', Action::NOTICE_OK); } else - $this->addNotice('page',$this->page->name,'NOT_SAVED',Action::NOTICE_WARN); + $this->addNotice('page', 0, $this->page->name, 'NOT_SAVED', Action::NOTICE_WARN); } @@ -807,11 +807,11 @@ class PageAction extends ObjectAction if ( $this->getRequestVar('delete') != '' ) { $this->page->delete(); - $this->addNotice('page',$this->page->filename,'DELETED',Action::NOTICE_OK); + $this->addNotice('page', 0, $this->page->filename, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice('page',$this->page->filename,'CANCELED',Action::NOTICE_WARN); + $this->addNotice('page', 0, $this->page->filename, 'CANCELED', Action::NOTICE_WARN); } } diff --git a/modules/cms/action/PageelementAction.class.php b/modules/cms/action/PageelementAction.class.php @@ -680,7 +680,7 @@ class PageelementAction extends BaseAction // Inhalt wieder herstellen, in dem er neu gespeichert wird. $this->value->save(); - $this->addNotice('pageelement',$this->value->element->name,'PAGEELEMENT_USE_FROM_ARCHIVE',Action::NOTICE_OK); + $this->addNotice('pageelement', 0, $this->value->element->name, 'PAGEELEMENT_USE_FROM_ARCHIVE', Action::NOTICE_OK); } @@ -703,7 +703,7 @@ class PageelementAction extends BaseAction // Inhalt freigeben $this->value->release(); - $this->addNotice('pageelement',$this->value->element->name,'PAGEELEMENT_RELEASED',Action::NOTICE_OK); + $this->addNotice('pageelement', 0, $this->value->element->name, 'PAGEELEMENT_RELEASED', Action::NOTICE_OK); } @@ -938,7 +938,7 @@ class PageelementAction extends BaseAction $value->save(); } - $this->addNotice('pageelement',$value->element->label,'SAVED',Action::NOTICE_OK); + $this->addNotice('pageelement', 0, $value->element->label, 'SAVED', Action::NOTICE_OK); $this->page->setTimestamp(); // "Letzte Aenderung" setzen // Falls ausgewaehlt die Seite sofort veroeffentlichen diff --git a/modules/cms/action/ProfileAction.class.php b/modules/cms/action/ProfileAction.class.php @@ -23,6 +23,7 @@ use cms\base\Configuration; use cms\model\BaseObject; use cms\model\User; use language\Language; +use language\Messages; use LogicException; use util\Mail; use util\UIUtils; @@ -71,14 +72,12 @@ class ProfileAction extends BaseAction $this->user->totp = $this->hasRequestVar('totp' ); - $this->setStyle( $this->user->style ); // Style sofort anwenden Session::setUser( $this->user ); if ( !empty($this->user->fullname) ) { $this->user->save(); - $this->setStyle($this->user->style); - $this->addNotice('user',$this->user->name,'SAVED','ok'); + $this->addNoticeFor( $this->user,Messages::SAVED); } else { @@ -147,11 +146,11 @@ class ProfileAction extends BaseAction if ( $mail->send() ) { - $this->addNotice('user',$this->user->name,'mail_sent',Action::NOTICE_OK); // Meldung + $this->addNotice('user', 0, $this->user->name, 'mail_sent', Action::NOTICE_OK); // Meldung } else { - $this->addNotice('user',$this->user->name,'mail_not_sent',Action::NOTICE_ERROR,array(),$mail->error); // Meldung + $this->addNotice('user', 0, $this->user->name, 'mail_not_sent', Action::NOTICE_ERROR, array(), $mail->error); // Meldung return; } } @@ -185,7 +184,7 @@ class ProfileAction extends BaseAction $this->user->mail = $newMail; $this->user->save(); - $this->addNotice('user',$this->user->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('user', 0, $this->user->name, 'SAVED', Action::NOTICE_OK); } else { @@ -218,7 +217,7 @@ class ProfileAction extends BaseAction else { $this->user->setPassword( $this->getRequestVar('password1') ); - $this->addNotice('user',$this->user->name,'SAVED','ok'); + $this->addNotice('user', 0, $this->user->name, 'SAVED', 'ok'); } } diff --git a/modules/cms/action/ProjectAction.class.php b/modules/cms/action/ProjectAction.class.php @@ -194,7 +194,7 @@ class ProjectAction extends BaseAction $this->project->delete(); $this->setTemplateVar('tree_refresh',true); - $this->addNotice('project',$this->project->name,'DELETED'); + $this->addNotice('project', 0, $this->project->name, 'DELETED'); } @@ -220,13 +220,13 @@ class ProjectAction extends BaseAction $this->project->checkLostFiles(); $status = empty($this->project->log) ? Action::NOTICE_OK : Action::NOTICE_ERROR; - $this->addNotice('project',$this->project->name,'DONE',$status,array(),$this->project->log); + $this->addNotice('project', 0, $this->project->name, 'DONE', $status, array(), $this->project->log); break; case 'check_limit': // Alte Versionen löschen. $this->project->checkLimit(); - $this->addNotice('project',$this->project->name,'DONE'); + $this->addNotice('project', 0, $this->project->name, 'DONE'); break; default: @@ -331,7 +331,7 @@ class ProjectAction extends BaseAction { $this->project->export( $this->getRequestVar('dbid') ); - $this->addNotice('project',$this->project->name,'DONE'); + $this->addNotice('project', 0, $this->project->name, 'DONE'); $this->setTemplateVar('done',true); } } diff --git a/modules/cms/action/ProjectlistAction.class.php b/modules/cms/action/ProjectlistAction.class.php @@ -102,14 +102,14 @@ class ProjectlistAction extends BaseAction $project = new Project(); $project->name = $this->getRequestVar('name'); $project->add(); - $this->addNotice('project',$project->name,'ADDED'); + $this->addNotice('project', 0, $project->name, 'ADDED'); break; case 'copy': $db = \cms\base\DB::get(); $project = new Project($this->getRequestVar('projectid')); $project->load(); $project->export($db->id); - $this->addNotice('project',$project->name,'DONE'); + $this->addNotice('project', 0, $project->name, 'DONE'); break; default: throw new \LogicException('Unknown type while adding project '.$this->getRequestVar('type') ); diff --git a/modules/cms/action/StartAction.class.php b/modules/cms/action/StartAction.class.php @@ -119,7 +119,7 @@ class StartAction extends BaseAction if ( !$db->available ) { - $this->addNotice('database',$db->conf['description'],'DATABASE_CONNECTION_ERROR',Action::NOTICE_ERROR,array(),array('Database Error: '.$db->error)); + $this->addNotice('database', 0, $db->conf['description'], 'DATABASE_CONNECTION_ERROR', Action::NOTICE_ERROR, array(), array('Database Error: ' . $db->error)); $this->callSubAction('showlogin'); return false; } @@ -316,7 +316,7 @@ class StartAction extends BaseAction if ( empty($dbids) ) - $this->addNotice('','','no_database_configuration',Action::NOTICE_WARN); + $this->addNotice('', 0, '', 'no_database_configuration', Action::NOTICE_WARN); if ( !isset($this->templateVars['login_name']) && isset($_COOKIE['or_username']) ) $this->setTemplateVar('login_name',$_COOKIE['or_username']); @@ -386,7 +386,7 @@ class StartAction extends BaseAction if ( $user->mustChangePassword ) { - $this->addNotice( 'user',$user->name,'PASSWORD_TIMEOUT','warn' ); + $this->addNotice('user', 0, $user->name, 'PASSWORD_TIMEOUT', 'warn'); $this->callSubAction( 'changepassword' ); // Zwang, das Kennwort zu �ndern. } @@ -422,10 +422,10 @@ class StartAction extends BaseAction // Kein Projekt vorhanden. Eine Hinweismeldung ausgeben. if ( $this->userIsAdmin() ) // Administratoren bekommen bescheid, dass sie ein Projekt anlegen sollen - $this->addNotice('','','ADMIN_NO_PROJECTS_AVAILABLE',Action::NOTICE_WARN); + $this->addNotice('', 0, '', 'ADMIN_NO_PROJECTS_AVAILABLE', Action::NOTICE_WARN); else // Normale Benutzer erhalten eine Meldung, dass kein Projekt zur Verf�gung steht - $this->addNotice('','','NO_PROJECTS_AVAILABLE',Action::NOTICE_WARN); + $this->addNotice('', 0, '', 'NO_PROJECTS_AVAILABLE', Action::NOTICE_WARN); } //$this->metaValues(); @@ -493,7 +493,7 @@ class StartAction extends BaseAction if ( !$openId->checkAuthentication() ) { - $this->addNotice('user',$openId->user,'LOGIN_OPENID_FAILED',Action::NOTICE_ERROR,array('name'=>$openId->user),array($openId->error) ); + $this->addNotice('user', 0, $openId->user, 'LOGIN_OPENID_FAILED', Action::NOTICE_ERROR, array('name' => $openId->user), array($openId->error)); $this->addValidationError('openid_url',''); $this->callSubAction('showlogin'); return; @@ -508,7 +508,7 @@ class StartAction extends BaseAction if ( empty($username) ) { // Es konnte kein Benutzername ermittelt werden. - $this->addNotice('user',$username,'LOGIN_OPENID_FAILED','error',array('name'=>$username) ); + $this->addNotice('user', 0, $username, 'LOGIN_OPENID_FAILED', 'error', array('name' => $username)); $this->addValidationError('openid_url',''); $this->callSubAction('showlogin'); return; @@ -531,7 +531,7 @@ class StartAction extends BaseAction else { // Benutzer ist nicht in Benutzertabelle vorhanden (und angelegt werden soll er auch nicht). - $this->addNotice('user',$username,'LOGIN_OPENID_FAILED','error',array('name'=>$username) ); + $this->addNotice('user', 0, $username, 'LOGIN_OPENID_FAILED', 'error', array('name' => $username)); $this->addValidationError('openid_url',''); $this->callSubAction('showlogin'); return; @@ -581,7 +581,7 @@ class StartAction extends BaseAction if ( ! $openId->login() ) { - $this->addNotice('user',$openid_user,'LOGIN_OPENID_FAILED','error',array('name'=>$openid_user),array($openId->error) ); + $this->addNotice('user', 0, $openid_user, 'LOGIN_OPENID_FAILED', 'error', array('name' => $openid_user), array($openId->error)); $this->addValidationError('openid_url',''); $this->callSubAction('showlogin'); return; @@ -609,14 +609,14 @@ class StartAction extends BaseAction if ( $this->mustChangePassword ) { // Anmeldung gescheitert, Benutzer muss Kennwort �ndern. - $this->addNotice('user',$loginName,'LOGIN_FAILED_MUSTCHANGEPASSWORD','error' ); + $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED_MUSTCHANGEPASSWORD', 'error'); $this->addValidationError('password1',''); $this->addValidationError('password2',''); } else { // Anmeldung gescheitert. - $this->addNotice('user',$loginName,'LOGIN_FAILED','error',array('name'=>$loginName) ); + $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED', 'error', array('name' => $loginName)); $this->addValidationError('login_name' ,''); $this->addValidationError('login_password',''); } @@ -635,7 +635,7 @@ class StartAction extends BaseAction $this->recreateSession(); $user = Session::getUser(); - $this->addNotice('user',$user->name,'LOGIN_OK',Action::NOTICE_OK,array('name'=>$user->fullname)); + $this->addNotice('user', 0, $user->name, 'LOGIN_OK', Action::NOTICE_OK, array('name' => $user->fullname)); } // Benutzer ist angemeldet @@ -870,7 +870,7 @@ class StartAction extends BaseAction else { Logger::warn('Guest login failed, user not found: '.$username); - $this->addNotice('user',$username,'LOGIN_FAILED',Action::NOTICE_WARN,array('name'=>$username) ); + $this->addNotice('user', 0, $username, 'LOGIN_FAILED', Action::NOTICE_WARN, array('name' => $username)); $user = null; } } @@ -914,7 +914,7 @@ class StartAction extends BaseAction if ( $user->mustChangePassword ) { - $this->addNotice( 'user',$user->name,'PASSWORD_TIMEOUT','warn' ); + $this->addNotice('user', 0, $user->name, 'PASSWORD_TIMEOUT', 'warn'); $this->callSubAction( 'changepassword' ); // Zwang, das Kennwort zu �ndern. } @@ -964,11 +964,11 @@ class StartAction extends BaseAction if ( $mail->send() ) { - $this->addNotice('','','mail_sent',Action::NOTICE_OK); + $this->addNotice('', 0, '', 'mail_sent', Action::NOTICE_OK); } else { - $this->addNotice('','','mail_not_sent',Action::NOTICE_ERROR,array(),$mail->error); + $this->addNotice('', 0, '', 'mail_not_sent', Action::NOTICE_ERROR, array(), $mail->error); $this->callSubAction('register'); return; } @@ -1052,7 +1052,7 @@ class StartAction extends BaseAction $newUser->setPassword( $this->getRequestVar('password'),true ); - $this->addNotice('user',$newUser->name,'user_added','ok'); + $this->addNotice('user', 0, $newUser->name, 'user_added', 'ok'); } @@ -1157,9 +1157,9 @@ class StartAction extends BaseAction $eMail->setVar('name',$user->getName()); $eMail->setVar('code',$code); if ( $eMail->send() ) - $this->addNotice('user',$user->getName(),'mail_sent',Action::NOTICE_OK); + $this->addNotice('user', 0, $user->getName(), 'mail_sent', Action::NOTICE_OK); else - $this->addNotice('user',$user->getName(),'mail_not_sent',Action::NOTICE_ERROR,array(),$eMail->error); + $this->addNotice('user', 0, $user->getName(), 'mail_not_sent', Action::NOTICE_ERROR, array(), $eMail->error); } else @@ -1168,7 +1168,7 @@ class StartAction extends BaseAction // Trotzdem vort�uschen, eine E-Mail zu senden, damit die G�ltigkeit // eines Benutzernamens nicht von au�en gepr�ft werden kann. // - $this->addNotice('user',$this->getRequestVar("username"),'mail_sent'); + $this->addNotice('user', 0, $this->getRequestVar("username"), 'mail_sent'); } $this->setSessionVar("password_commit_name",$user->name); @@ -1206,7 +1206,7 @@ class StartAction extends BaseAction if ( !$user->isValid() ) { // Benutzer konnte nicht geladen werden. - $this->addNotice('user',$username,'error',Action::NOTICE_ERROR); + $this->addNotice('user', 0, $username, 'error', Action::NOTICE_ERROR); return; } @@ -1219,13 +1219,13 @@ class StartAction extends BaseAction if ( $eMail->send() ) { $user->setPassword( $newPw, false ); // Kennwort muss beim n�. Login ge�ndert werden. - $this->addNotice('user',$username,'mail_sent',Action::NOTICE_OK); + $this->addNotice('user', 0, $username, 'mail_sent', Action::NOTICE_OK); } else { // Sollte eigentlich nicht vorkommen, da der Benutzer ja auch schon den // Code per E-Mail erhalten hat. - $this->addNotice('user',$username,'error',Action::NOTICE_ERROR,array(),$eMail->error); + $this->addNotice('user', 0, $username, 'error', Action::NOTICE_ERROR, array(), $eMail->error); } } diff --git a/modules/cms/action/TemplateAction.class.php b/modules/cms/action/TemplateAction.class.php @@ -107,7 +107,7 @@ class TemplateAction extends BaseAction $templatemodel->save(); - $this->addNotice('template',$this->template->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('template', 0, $this->template->name, 'SAVED', Action::NOTICE_OK); } @@ -151,7 +151,7 @@ class TemplateAction extends BaseAction { $this->template->name = $this->getRequestVar('name'); $this->template->save(); - $this->addNotice('template',$this->template->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('template', 0, $this->template->name, 'SAVED', Action::NOTICE_OK); } } @@ -163,11 +163,11 @@ class TemplateAction extends BaseAction if ( $this->getRequestVar('delete') != '' ) { $this->template->delete(); - $this->addNotice('template',$this->template->name,'DELETED',Action::NOTICE_OK); + $this->addNotice('template', 0, $this->template->name, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice('template',$this->template->name,'CANCELED',Action::NOTICE_WARN); + $this->addNotice('template', 0, $this->template->name, 'CANCELED', Action::NOTICE_WARN); } } @@ -218,7 +218,7 @@ class TemplateAction extends BaseAction // Validierung: Werte dürfen nicht doppelt vorkommen. if ( in_array($input, $extensions) ) { - $this->addNotice('template',$this->template->name,'DUPLICATE_INPUT','error'); + $this->addNotice('template', 0, $this->template->name, 'DUPLICATE_INPUT', 'error'); throw new \util\exception\ValidationException( $modelName ); } @@ -235,7 +235,7 @@ class TemplateAction extends BaseAction $templatemodel->save(); } - $this->addNotice('template',$this->template->name,'SAVED','ok'); + $this->addNotice('template', 0, $this->template->name, 'SAVED', 'ok'); } @@ -292,7 +292,7 @@ class TemplateAction extends BaseAction } - $this->addNotice('template',$this->template->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('template', 0, $this->template->name, 'SAVED', Action::NOTICE_OK); } @@ -598,14 +598,9 @@ class TemplateAction extends BaseAction $page->publish(); } - $this->addNotice( 'template', - $this->template->name, - 'PUBLISHED', - Action::NOTICE_OK, - array(), - array_map( function($obj) { - return $obj['full_filename']; - },$publisher->publishedObjects) ); + $this->addNotice('template', 0, $this->template->name, 'PUBLISHED', Action::NOTICE_OK, array(), array_map(function ($obj) { + return $obj['full_filename']; + }, $publisher->publishedObjects)); $publisher->close(); } diff --git a/modules/cms/action/TemplatelistAction.class.php b/modules/cms/action/TemplatelistAction.class.php @@ -124,7 +124,7 @@ class TemplatelistAction extends BaseAction $template = new Template(); $template->projectid = $this->project->projectid; $template->add( $this->getRequestVar('name') ); - $this->addNotice('template',$template->name,'ADDED','ok'); + $this->addNotice('template', 0, $template->name, 'ADDED', 'ok'); break; case 'copy': @@ -141,7 +141,7 @@ class TemplatelistAction extends BaseAction $template = new Template(); $template->projectid = $this->project->projectid; $template->add( $this->getRequestVar('name') ); - $this->addNotice('template',$template->name,'ADDED','ok'); + $this->addNotice('template', 0, $template->name, 'ADDED', 'ok'); // Template kopieren. $copy_template = new Template( $copy_templateid ); @@ -178,7 +178,7 @@ class TemplatelistAction extends BaseAction $newTemplateModel->save(); } - $this->addNotice('template',$copy_template->name,'COPIED','ok'); + $this->addNotice('template', 0, $copy_template->name, 'COPIED', 'ok'); break; @@ -228,7 +228,7 @@ class TemplatelistAction extends BaseAction $template->save(); $templateModel->save(); - $this->addNotice('template',$template->name,'ADDED','ok'); + $this->addNotice('template', 0, $template->name, 'ADDED', 'ok'); break; diff --git a/modules/cms/action/TextAction.class.php b/modules/cms/action/TextAction.class.php @@ -69,7 +69,7 @@ class TextAction extends FileAction $this->text->value = $this->getRequestVar('value', RequestParams::FILTER_RAW); $this->text->saveValue(); - $this->addNotice($this->text->getType(), $this->text->name, 'VALUE_SAVED', 'ok'); + $this->addNotice($this->text->getType(), 0, $this->text->name, 'VALUE_SAVED', 'ok'); $this->text->setTimestamp(); } diff --git a/modules/cms/action/UrlAction.class.php b/modules/cms/action/UrlAction.class.php @@ -81,7 +81,7 @@ class UrlAction extends ObjectAction if ( $this->hasRequestVar("delete") ) { $this->url->delete(); - $this->addNotice('url',$this->url->name,'DELETED'); + $this->addNotice('url', 0, $this->url->name, 'DELETED'); } } @@ -98,11 +98,11 @@ class UrlAction extends ObjectAction if ( $this->getRequestVar('delete') != '' ) { $this->url->delete(); - $this->addNotice('url',$this->url->filename,'DELETED',Action::NOTICE_OK); + $this->addNotice('url', 0, $this->url->filename, 'DELETED', Action::NOTICE_OK); } else { - $this->addNotice('url',$this->url->filename,'CANCELED',Action::NOTICE_WARN); + $this->addNotice('url', 0, $this->url->filename, 'CANCELED', Action::NOTICE_WARN); } } @@ -116,7 +116,7 @@ class UrlAction extends ObjectAction $this->url->save(); $this->url->setTimestamp(); - $this->addNotice('url',$this->url->name,'SAVED',Action::NOTICE_OK); + $this->addNotice('url', 0, $this->url->name, 'SAVED', Action::NOTICE_OK); } diff --git a/modules/cms/action/UserAction.class.php b/modules/cms/action/UserAction.class.php @@ -95,7 +95,7 @@ class UserAction extends BaseAction $this->user->style = $this->getRequestVar('style' ); $this->user->save(); - $this->addNotice('user',$this->user->name,'SAVED','ok'); + $this->addNotice('user', 0, $this->user->name, 'SAVED', 'ok'); } @@ -136,7 +136,7 @@ class UserAction extends BaseAction { $this->user->delGroup( $this->getRequestVar('groupid') ); - $this->addNotice('user',$this->user->name,'DELETED','ok'); + $this->addNotice('user', 0, $this->user->name, 'DELETED', 'ok'); } @@ -205,10 +205,10 @@ class UserAction extends BaseAction if ( $this->hasRequestVar('email') && !empty($this->user->mail) && $conf['mail']['enabled'] ) { $this->mailPw( $newPassword ); - $this->addNotice('user',$this->user->name,'MAIL_SENT','ok'); + $this->addNotice('user', 0, $this->user->name, 'MAIL_SENT', 'ok'); } - $this->addNotice('user',$this->user->name,'SAVED','ok'); + $this->addNotice('user', 0, $this->user->name, 'SAVED', 'ok'); } @@ -340,7 +340,7 @@ class UserAction extends BaseAction $conf = \cms\base\Configuration::rawConfig(); if ($conf['security']['authorize']['type']=='ldap') - $this->addNotice('user',$this->user->name,'GROUPS_MAY_CONFLICT_WITH_LDAP',Action::NOTICE_WARN); + $this->addNotice('user', 0, $this->user->name, 'GROUPS_MAY_CONFLICT_WITH_LDAP', Action::NOTICE_WARN); } @@ -357,20 +357,20 @@ class UserAction extends BaseAction if ( !$hasGroup && $this->hasRequestVar('group'.$id) ) { $this->user->addGroup($id); - $this->addNotice('group',$name,'ADDED'); + $this->addNotice('group', 0, $name, 'ADDED'); $aenderung = true; } if ( $hasGroup && !$this->hasRequestVar('group'.$id) ) { $this->user->delGroup($id); - $this->addNotice('group',$name,'DELETED'); + $this->addNotice('group', 0, $name, 'DELETED'); $aenderung = true; } } if ( ! $aenderung ) - $this->addNotice('group',$name,'NOTHING_DONE'); + $this->addNotice('group', 0, $name, 'NOTHING_DONE'); } @@ -460,7 +460,7 @@ class UserAction extends BaseAction $this->setTemplateVar('show',Acl::getAvailableRights() ); if ( $this->user->isAdmin ) - $this->addNotice('user',$this->user->name,'ADMIN_NEEDS_NO_RIGHTS',Action::NOTICE_WARN); + $this->addNotice('user', 0, $this->user->name, 'ADMIN_NEEDS_NO_RIGHTS', Action::NOTICE_WARN); } diff --git a/modules/cms/base/DefaultConfig.class.php b/modules/cms/base/DefaultConfig.class.php @@ -967,10 +967,6 @@ class DefaultConfig { 'expect_regexp' => '/running on/', 'username_regexp' => '/running on localhost as ([a-z]+)@localhost/', ], - 'logout' => - [ - 'redirect_url' => '0', - ], 'user' => [ 'show_admin_mail' => true, diff --git a/modules/cms/model/Acl.class.php b/modules/cms/model/Acl.class.php @@ -524,4 +524,11 @@ SQL return ''; } + + public function getId() + { + return $this->aclid; + } + + } \ No newline at end of file diff --git a/modules/cms/model/BaseObject.class.php b/modules/cms/model/BaseObject.class.php @@ -1790,6 +1790,12 @@ SQL return ""; } + + public function getId() + { + return $this->objectid; + } + } diff --git a/modules/cms/model/Element.class.php b/modules/cms/model/Element.class.php @@ -576,4 +576,11 @@ SQL return $this->label; } + + public function getId() + { + return $this->elementid; + } + + } \ No newline at end of file diff --git a/modules/cms/model/File.class.php b/modules/cms/model/File.class.php @@ -451,6 +451,7 @@ SQL { return $this->size; } + } ?> \ No newline at end of file diff --git a/modules/cms/model/Group.class.php b/modules/cms/model/Group.class.php @@ -358,6 +358,9 @@ class Group extends ModelBase return $this->name; } -} + public function getId() + { + return $this->groupid; + } -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/cms/model/Language.class.php b/modules/cms/model/Language.class.php @@ -239,6 +239,11 @@ class Language extends ModelBase return $this->name; } -} -?>- \ No newline at end of file + + public function getId() + { + return $this->languageid; + } + +}+ \ No newline at end of file diff --git a/modules/cms/model/Model.class.php b/modules/cms/model/Model.class.php @@ -216,6 +216,12 @@ SQL { return $this->name; } -} -?>- \ No newline at end of file + + public function getId() + { + return $this->modelid; + } + + +}+ \ No newline at end of file diff --git a/modules/cms/model/ModelBase.class.php b/modules/cms/model/ModelBase.class.php @@ -21,4 +21,6 @@ abstract class ModelBase public abstract function load(); public abstract function delete(); + + public abstract function getId(); } diff --git a/modules/cms/model/Name.class.php b/modules/cms/model/Name.class.php @@ -1,172 +1,174 @@ <?php -namespace cms\model { - - /** - * Darstellung von Name und Beschreibung eines Objektes. - * - * @author Jan Dankert - * @package openrat.objects - */ - class Name extends ModelBase - { - /** eindeutige ID dieses Objektes - * @type Integer - */ - public $nameid; - - - public $objectid; - /** Sprach-ID - * @see Language - * @type Integer - */ - public $languageid; - - - /** Logischer (sprachabhaengiger) Name des Objektes - * (wird in Tabelle <code>name</code> abgelegt) - * @type String - */ - public $name = ''; - - /** Logische (sprachabhaengige) Beschreibung des Objektes - * (wird in Tabelle <code>name</code> abgelegt) - * @type String - */ - public $description; - /** <strong>Konstruktor</strong> - * - * @param Integer Objekt-ID - */ - function __construct($nameid=0 ) - { - $this->nameid = $nameid; - } - - - /** - * Lesen der Eigenschaften aus der Datenbank - * Es werden - * - die sprachabh?ngigen Daten wie Name und Beschreibung geladen - * @throws \util\exception\ObjectNotFoundException - */ - public function load() - { - $db = \cms\base\DB::get(); - - $stmt = $db->sql( <<<SQL - SELECT id,objectid,name,descr,languageid - FROM {{name}} - WHERE languageid = {languageid} - AND objectid = {objectid} +namespace cms\model; + +/** + * Darstellung von Name und Beschreibung eines Objektes. + * + * @author Jan Dankert + * @package openrat.objects + */ +class Name extends ModelBase +{ + /** eindeutige ID dieses Objektes + * @type Integer + */ + public $nameid; + + + public $objectid; + /** Sprach-ID + * @see Language + * @type Integer + */ + public $languageid; + + + /** Logischer (sprachabhaengiger) Name des Objektes + * (wird in Tabelle <code>name</code> abgelegt) + * @type String + */ + public $name = ''; + + /** Logische (sprachabhaengige) Beschreibung des Objektes + * (wird in Tabelle <code>name</code> abgelegt) + * @type String + */ + public $description; + /** <strong>Konstruktor</strong> + * + * @param Integer Objekt-ID + */ + function __construct($nameid=0 ) + { + $this->nameid = $nameid; + } + + + /** + * Lesen der Eigenschaften aus der Datenbank + * Es werden + * - die sprachabh?ngigen Daten wie Name und Beschreibung geladen + * @throws \util\exception\ObjectNotFoundException + */ + public function load() + { + $db = \cms\base\DB::get(); + + $stmt = $db->sql( <<<SQL +SELECT id,objectid,name,descr,languageid +FROM {{name}} +WHERE languageid = {languageid} + AND objectid = {objectid} SQL - ); + ); - $stmt->setInt('languageid', $this->languageid); - $stmt->setInt('objectid' , $this->objectid ); + $stmt->setInt('languageid', $this->languageid); + $stmt->setInt('objectid' , $this->objectid ); - $row = $stmt->getRow(); + $row = $stmt->getRow(); - if (count($row) > 0) - $this->setDatabaseRow( $row ); - } + if (count($row) > 0) + $this->setDatabaseRow( $row ); + } - /** - * Setzt die Eigenschaften des Objektes mit einer Datenbank-Ergebniszeile - * - * @param array Ergebniszeile aus Datenbanktabelle - */ - private function setDatabaseRow( $row ) - { - $this->nameid = $row['id' ]; - $this->objectid = $row['objectid' ]; - $this->languageid = $row['languageid']; - $this->name = $row['name' ]; - $this->description = $row['descr']; - } + /** + * Setzt die Eigenschaften des Objektes mit einer Datenbank-Ergebniszeile + * + * @param array Ergebniszeile aus Datenbanktabelle + */ + private function setDatabaseRow( $row ) + { + $this->nameid = $row['id' ]; + $this->objectid = $row['objectid' ]; + $this->languageid = $row['languageid']; + $this->name = $row['name' ]; + $this->description = $row['descr']; + } - /** - * Logischen Namen und Beschreibung des Objektes in Datenbank speichern - * - */ - public function save() - { - $db = \cms\base\DB::get(); + /** + * Logischen Namen und Beschreibung des Objektes in Datenbank speichern + * + */ + public function save() + { + $db = \cms\base\DB::get(); - if ( intval($this->nameid) > 0) - { - $sql = $db->sql( <<<SQL - UPDATE {{name}} SET - name = {name}, - descr = {desc} - WHERE objectid ={objectid} - AND languageid={languageid} + if ( intval($this->nameid) > 0) + { + $sql = $db->sql( <<<SQL + UPDATE {{name}} SET + name = {name}, + descr = {desc} + WHERE objectid ={objectid} + AND languageid={languageid} SQL - ); - $sql->setString('name', $this->name); - $sql->setString('desc', $this->description); - $sql->setInt( 'objectid' , $this->objectid ); - $sql->setInt( 'languageid', $this->languageid ); - $sql->query(); - } - else - { - $sql = $db->sql('SELECT MAX(id) FROM {{name}}'); - $this->nameid = intval($sql->getOne())+1; - - $sql = $db->sql('INSERT INTO {{name}}'.' (id,objectid,languageid,name,descr)'.' VALUES( {nameid},{objectid},{languageid},{name},{desc} )'); - $sql->setInt ('nameid' , $this->nameid ); - $sql->setInt ('objectid' , $this->objectid ); - $sql->setInt ('languageid', $this->languageid ); - $sql->setString('name' , $this->name); - $sql->setString('desc' , $this->description); - $sql->query(); - } - } - - - - public function delete() + ); + $sql->setString('name', $this->name); + $sql->setString('desc', $this->description); + $sql->setInt( 'objectid' , $this->objectid ); + $sql->setInt( 'languageid', $this->languageid ); + $sql->query(); + } + else { - // not necessary, because names are deleted by BaseObject::delete() - + $sql = $db->sql('SELECT MAX(id) FROM {{name}}'); + $this->nameid = intval($sql->getOne())+1; + + $sql = $db->sql('INSERT INTO {{name}}'.' (id,objectid,languageid,name,descr)'.' VALUES( {nameid},{objectid},{languageid},{name},{desc} )'); + $sql->setInt ('nameid' , $this->nameid ); + $sql->setInt ('objectid' , $this->objectid ); + $sql->setInt ('languageid', $this->languageid ); + $sql->setString('name' , $this->name); + $sql->setString('desc' , $this->description); + $sql->query(); } + } + + + + public function delete() + { + // not necessary, because names are deleted by BaseObject::delete() + } - /** - */ - public function objectDelete() - { - // not necessary, because names are deleted by BaseObject::delete() - } + /** + */ + public function objectDelete() + { + // not necessary, because names are deleted by BaseObject::delete() + } - /** - * Eigenschaften des Objektes. - * @return array - */ - public function getProperties() - { - return get_object_vars( $this ); - } + /** + * Eigenschaften des Objektes. + * @return array + */ + public function getProperties() + { + return get_object_vars( $this ); - public function getName() - { - return $this->name; - } + } - } + public function getName() + { + return $this->name; + } + public function getId() + { + return $this->nameid; + } -}?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/cms/model/Pageelement.class.php b/modules/cms/model/Pageelement.class.php @@ -56,5 +56,13 @@ class Pageelement extends ModelBase { } + + + public function getId() + { + return $this->pageid.'_'.$this->elementid; + } + + } diff --git a/modules/cms/model/Project.class.php b/modules/cms/model/Project.class.php @@ -1062,5 +1062,14 @@ SQL return "$scheme$user$pass$host$port$path$query$fragment"; } + + + + public function getId() + { + return $this->projectid; + } + + } diff --git a/modules/cms/model/Template.class.php b/modules/cms/model/Template.class.php @@ -312,4 +312,10 @@ SQL return $this->name; } + public function getId() + { + return $this->templateid; + } + + } \ No newline at end of file diff --git a/modules/cms/model/TemplateModel.class.php b/modules/cms/model/TemplateModel.class.php @@ -179,5 +179,12 @@ class TemplateModel extends ModelBase return ''; } + + public function getId() + { + return $this->templatemodelid; + } + + } diff --git a/modules/cms/model/User.class.php b/modules/cms/model/User.class.php @@ -1040,6 +1040,13 @@ SQL $stmt->execute(); } - + + + public function getId() + { + return $this->userid; + } + + } diff --git a/modules/cms/model/Value.class.php b/modules/cms/model/Value.class.php @@ -737,4 +737,13 @@ SQL { return "Value: ".print_r($this,true); } + + + + public function getId() + { + return $this->valueid; + } + + } \ No newline at end of file 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/element/advanced.php b/modules/cms/ui/themes/default/html/views/element/advanced.php @@ -25,7 +25,7 @@ </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php $if1=(isset($subtypes)); if($if1) { ?> - <select name="<?php echo O::escapeHtml('subtype') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('subtype') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($subtypes as $_key=>$_value) { ?> @@ -35,9 +35,7 @@ </select> <?php } ?> <?php $if1=!(isset($subtypes)); if($if1) { ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('subtype') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$subtype.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('subtype') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$subtype.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> </div> </div> @@ -101,9 +99,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -114,9 +110,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -127,7 +121,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dateformat') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dateformat') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dateformats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dateformat){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -161,9 +155,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('decimals') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('2') ?>" value="<?php echo O::escapeHtml(''.@$decimals.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('decimals') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('2') ?>" value="<?php echo O::escapeHtml(''.@$decimals.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -174,9 +166,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('dec_point') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('5') ?>" value="<?php echo O::escapeHtml(''.@$dec_point.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('dec_point') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('5') ?>" value="<?php echo O::escapeHtml(''.@$dec_point.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -187,9 +177,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('thousand_sep') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('1') ?>" value="<?php echo O::escapeHtml(''.@$thousand_sep.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('thousand_sep') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('1') ?>" value="<?php echo O::escapeHtml(''.@$thousand_sep.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -200,9 +188,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('default_text') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$default_text.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('default_text') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$default_text.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -268,7 +254,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('linkelement') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('linkelement') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($linkelements as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkelement){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -284,7 +270,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('name') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('name') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($names as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$name){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -300,7 +286,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('folderobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('folderobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($folders as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$folderobjectid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -316,7 +302,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('default_objectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('default_objectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($objects as $_key=>$_value) { ?> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/element/name.php b/modules/cms/ui/themes/default/html/views/element/name.php @@ -13,9 +13,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <tr><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/element/prop.php b/modules/cms/ui/themes/default/html/views/element/prop.php @@ -15,9 +15,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('label') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('100') ?>" value="<?php echo O::escapeHtml(''.@$label.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('label') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('100') ?>" value="<?php echo O::escapeHtml(''.@$label.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -26,9 +24,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -51,7 +47,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('typeid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('typeid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/element/properties.php b/modules/cms/ui/themes/default/html/views/element/properties.php @@ -15,7 +15,7 @@ </td> <td><?php echo O::escapeHtml('') ?> <?php $if1=(isset($subtypes)); if($if1) { ?> - <select name="<?php echo O::escapeHtml('subtype') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('subtype') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($subtypes as $_key=>$_value) { ?> @@ -25,9 +25,7 @@ </select> <?php } ?> <?php $if1=!(isset($subtypes)); if($if1) { ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('subtype') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$subtype.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('subtype') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$subtype.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> </td> </tr> @@ -72,9 +70,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -85,9 +81,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -98,7 +92,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dateformat') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dateformat') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dateformats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dateformat){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -132,9 +126,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('decimals') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('2') ?>" value="<?php echo O::escapeHtml(''.@$decimals.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('decimals') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('2') ?>" value="<?php echo O::escapeHtml(''.@$decimals.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -145,9 +137,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('dec_point') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('5') ?>" value="<?php echo O::escapeHtml(''.@$dec_point.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('dec_point') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('5') ?>" value="<?php echo O::escapeHtml(''.@$dec_point.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -158,9 +148,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('thousand_sep') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('1') ?>" value="<?php echo O::escapeHtml(''.@$thousand_sep.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('thousand_sep') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('1') ?>" value="<?php echo O::escapeHtml(''.@$thousand_sep.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -171,9 +159,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('default_text') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$default_text.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('default_text') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$default_text.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -239,7 +225,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('linkelement') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('linkelement') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($linkelements as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkelement){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -255,7 +241,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('name') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('name') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($names as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$name){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -271,7 +257,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('folderobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('folderobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($folders as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$folderobjectid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -287,7 +273,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('default_objectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('default_objectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($objects as $_key=>$_value) { ?> diff --git a/modules/cms/ui/themes/default/html/views/file/advanced.php b/modules/cms/ui/themes/default/html/views/file/advanced.php @@ -10,12 +10,12 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('file_extension') ?> </span> - <input name="<?php echo O::escapeHtml('extension') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$extension.'') ?>" class="<?php echo O::escapeHtml('extension') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('extension') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$extension.'') ?>" class="<?php echo O::escapeHtml('extension or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('type') ?> </span> - <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/file/compress.php b/modules/cms/ui/themes/default/html/views/file/compress.php @@ -24,7 +24,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $gz= gz; ?> <?php } ?> - <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==gz){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/file/info.php b/modules/cms/ui/themes/default/html/views/file/info.php @@ -139,7 +139,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.php b/modules/cms/ui/themes/default/html/views/folder/advanced.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfile.php b/modules/cms/ui/themes/default/html/views/folder/createfile.php @@ -41,9 +41,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -63,9 +61,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfolder.php b/modules/cms/ui/themes/default/html/views/folder/createfolder.php @@ -14,9 +14,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createimage.php b/modules/cms/ui/themes/default/html/views/folder/createimage.php @@ -41,9 +41,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -63,9 +61,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createlink.php b/modules/cms/ui/themes/default/html/views/folder/createlink.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createpage.php b/modules/cms/ui/themes/default/html/views/folder/createpage.php @@ -13,7 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('templateid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('templateid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($templates as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==''){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -27,9 +27,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus,name') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus,name or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createtext.php b/modules/cms/ui/themes/default/html/views/folder/createtext.php @@ -40,9 +40,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -62,9 +60,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createurl.php b/modules/cms/ui/themes/default/html/views/folder/createurl.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -24,9 +22,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/inherit.php b/modules/cms/ui/themes/default/html/views/folder/inherit.php @@ -23,9 +23,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $inherit= 1; ?> <?php } ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('inherit') ?>" type="<?php echo O::escapeHtml('checkbox') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$inherit.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('inherit') ?>" type="<?php echo O::escapeHtml('checkbox') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$inherit.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('inherit_rights').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/folder/order.php b/modules/cms/ui/themes/default/html/views/folder/order.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>" class="<?php echo O::escapeHtml('or-table--sortable') ?>"><?php echo O::escapeHtml('') ?> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/group/add.php b/modules/cms/ui/themes/default/html/views/group/add.php @@ -13,9 +13,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/group/memberships.php b/modules/cms/ui/themes/default/html/views/group/memberships.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/group/prop.php b/modules/cms/ui/themes/default/html/views/group/prop.php @@ -15,9 +15,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('100') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('name focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('100') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('name focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.php b/modules/cms/ui/themes/default/html/views/group/rights.php @@ -25,7 +25,7 @@ <?php $if1=!(($rights)==FALSE); if($if1) { ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/grouplist/add.php b/modules/cms/ui/themes/default/html/views/grouplist/add.php @@ -13,9 +13,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/image/compress.php b/modules/cms/ui/themes/default/html/views/image/compress.php @@ -24,7 +24,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $gz= gz; ?> <?php } ?> - <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==gz){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/image/size.php b/modules/cms/ui/themes/default/html/views/image/size.php @@ -40,7 +40,7 @@ <span><?php echo O::escapeHtml(''.@O::lang('FILE_IMAGE_SIZE_FACTOR').'') ?> </span> </label> - <select name="<?php echo O::escapeHtml('factor') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('factor') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($factors as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$factor){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -63,14 +63,10 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(' * ') ?> </span> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -92,7 +88,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -110,7 +106,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $jpeg_compression= 70; ?> <?php } ?> - <select name="<?php echo O::escapeHtml('jpeg_compression') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('jpeg_compression') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($jpeglist as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$jpeg_compression){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/language/add.php b/modules/cms/ui/themes/default/html/views/language/add.php @@ -13,7 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('isocode') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('isocode') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($isocodes as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$isocode){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/language/prop.php b/modules/cms/ui/themes/default/html/views/language/prop.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -24,9 +22,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('isocode') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$isocode.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('isocode') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$isocode.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/languagelist/add.php b/modules/cms/ui/themes/default/html/views/languagelist/add.php @@ -13,7 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('isocode') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('isocode') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($isocodes as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$isocode){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/login/login.php b/modules/cms/ui/themes/default/html/views/login/login.php @@ -45,9 +45,7 @@ </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php $if1=!(isset($force_username)); if($if1) { ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('login_name') ?>" required="<?php echo O::escapeHtml('required') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('USER_USERNAME').'') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$login_name.'') ?>" class="<?php echo O::escapeHtml('name') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('login_name') ?>" required="<?php echo O::escapeHtml('required') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('USER_USERNAME').'') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$login_name.'') ?>" class="<?php echo O::escapeHtml('name or-input') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> <?php if(!$if1) { ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('login_name') ?>" value="<?php echo O::escapeHtml(''.@$login_name.'') ?>" /><?php echo O::escapeHtml('') ?> @@ -64,9 +62,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('login_password') ?>" size="<?php echo O::escapeHtml('20') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$login_password.'') ?>" class="<?php echo O::escapeHtml('name') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('login_password') ?>" size="<?php echo O::escapeHtml('20') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$login_password.'') ?>" class="<?php echo O::escapeHtml('name or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -98,9 +94,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password1') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password1.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password1') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password1.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -111,9 +105,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password2') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password2.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password2') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password2.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -135,9 +127,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('user_token') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('30') ?>" value="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('user_token') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('30') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -160,7 +150,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dbids as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/login/openid.php b/modules/cms/ui/themes/default/html/views/login/openid.php @@ -36,9 +36,7 @@ <?php } ?> <?php $if1=($openid_user_identity); if($if1) { ?> <input type="<?php echo O::escapeHtml('radio') ?>" name="<?php echo O::escapeHtml('openid_provider') ?>" value="<?php echo O::escapeHtml('identity') ?>" <?php if(@$openid_provider=='identity'){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('openid_url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$openid_url.'') ?>" class="<?php echo O::escapeHtml('name') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('openid_url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$openid_url.'') ?>" class="<?php echo O::escapeHtml('name or-input') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> </div> </div> @@ -62,7 +60,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dbids as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/login/password.php b/modules/cms/ui/themes/default/html/views/login/password.php @@ -25,9 +25,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('username') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('username') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -36,7 +34,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dbids as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.php b/modules/cms/ui/themes/default/html/views/login/passwordcode.php @@ -27,9 +27,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('code') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('code') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <tr><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/login/register.php b/modules/cms/ui/themes/default/html/views/login/register.php @@ -27,9 +27,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/login/registercode.php b/modules/cms/ui/themes/default/html/views/login/registercode.php @@ -24,9 +24,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('code') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('code') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -35,9 +33,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('username') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('username') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -46,9 +42,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -57,7 +51,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dbids as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/model/prop.php b/modules/cms/ui/themes/default/html/views/model/prop.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/modellist/add.php b/modules/cms/ui/themes/default/html/views/modellist/add.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/object/aclform.php b/modules/cms/ui/themes/default/html/views/object/aclform.php @@ -36,7 +36,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('userid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('userid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($users as $_key=>$_value) { ?> @@ -56,7 +56,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('groupid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('groupid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($groups as $_key=>$_value) { ?> @@ -86,7 +86,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('languageid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('languageid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($languages as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==''){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/object/copy.php b/modules/cms/ui/themes/default/html/views/object/copy.php @@ -20,7 +20,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/object/info.php b/modules/cms/ui/themes/default/html/views/object/info.php @@ -144,7 +144,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> @@ -296,7 +296,7 @@ <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/object/name.php b/modules/cms/ui/themes/default/html/views/object/name.php @@ -20,7 +20,7 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('name') ?> </span> - <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-checkbox') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('description') ?> diff --git a/modules/cms/ui/themes/default/html/views/object/prop.php b/modules/cms/ui/themes/default/html/views/object/prop.php @@ -19,17 +19,17 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('filename').'') ?> </span> - <input name="<?php echo O::escapeHtml('filename') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$filename.'') ?>" class="<?php echo O::escapeHtml('filename') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('filename') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$filename.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('alias').'') ?> </span> - <input name="<?php echo O::escapeHtml('alias_filename') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$alias_filename.'') ?>" class="<?php echo O::escapeHtml('filename') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('alias_filename') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$alias_filename.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('folder').'') ?> </span> - <select name="<?php echo O::escapeHtml('alias_folderid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('alias_folderid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($folders as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$alias_folderid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/object/settings.php b/modules/cms/ui/themes/default/html/views/object/settings.php @@ -24,12 +24,8 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('valid_from_date') ?>" type="<?php echo O::escapeHtml('date') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_from_date.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('valid_from_time') ?>" type="<?php echo O::escapeHtml('time') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_from_time.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('valid_from_date') ?>" type="<?php echo O::escapeHtml('date') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_from_date.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('valid_from_time') ?>" type="<?php echo O::escapeHtml('time') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_from_time.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -40,12 +36,8 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('valid_until_date') ?>" type="<?php echo O::escapeHtml('date') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_until_date.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('valid_until_time') ?>" type="<?php echo O::escapeHtml('time') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_until_time.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('valid_until_date') ?>" type="<?php echo O::escapeHtml('date') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_until_date.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('valid_until_time') ?>" type="<?php echo O::escapeHtml('time') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$valid_until_time.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/changetemplate.php b/modules/cms/ui/themes/default/html/views/page/changetemplate.php @@ -28,7 +28,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('newtemplateid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('newtemplateid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($templates as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==''){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/page/changetemplateselectelements.php b/modules/cms/ui/themes/default/html/views/page/changetemplateselectelements.php @@ -15,7 +15,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml(''.@$newElementsName.'') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml(''.@$newElementsName.'') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($newElementsList as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==''){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> 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,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/page/form.php b/modules/cms/ui/themes/default/html/views/page/form.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> @@ -51,16 +51,14 @@ </td> <td><?php echo O::escapeHtml('') ?> <?php $if1=(in_array($type,explode(",",text,date,number)); if($if1) { ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml(''.@$id.'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$value.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml(''.@$id.'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$value.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> <?php $if1=($type=='longtext'); if($if1) { ?> <textarea name="<?php echo O::escapeHtml(''.@$id.'') ?>" class="<?php echo O::escapeHtml('inputarea') ?>"><?php echo O::escapeHtml(''.@$value.'') ?> </textarea> <?php } ?> <?php $if1=(in_array($type,explode(",",select,link,list)); if($if1) { ?> - <select name="<?php echo O::escapeHtml(''.@$id.'') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml(''.@$id.'') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($list as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$value){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/page/name.php b/modules/cms/ui/themes/default/html/views/page/name.php @@ -20,7 +20,7 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('name') ?> </span> - <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-checkbox') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('description') ?> @@ -42,12 +42,12 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('alias') ?> </span> - <input name="<?php echo O::escapeHtml('alias_filename') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$alias_filename.'') ?>" class="<?php echo O::escapeHtml('filename') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('alias_filename') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$alias_filename.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('folder') ?> </span> - <select name="<?php echo O::escapeHtml('alias_folderid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('alias_folderid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($folders as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$alias_folderid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/page/preview.php b/modules/cms/ui/themes/default/html/views/page/preview.php @@ -7,13 +7,13 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('page') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('preview') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('languageid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('languageid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($languages as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$languageid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> - <select name="<?php echo O::escapeHtml('modelid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('modelid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($models as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$modelid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/page/src.php b/modules/cms/ui/themes/default/html/views/page/src.php @@ -7,13 +7,13 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('page') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('src') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('languageid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('languageid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($languages as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$languageid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> - <select name="<?php echo O::escapeHtml('modelid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('modelid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($models as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$modelid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/advanced.php b/modules/cms/ui/themes/default/html/views/pageelement/advanced.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/diff.php b/modules/cms/ui/themes/default/html/views/pageelement/diff.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/edit.php b/modules/cms/ui/themes/default/html/views/pageelement/edit.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/export.php b/modules/cms/ui/themes/default/html/views/pageelement/export.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <tr><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.php b/modules/cms/ui/themes/default/html/views/pageelement/history.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/import.php b/modules/cms/ui/themes/default/html/views/pageelement/import.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <tr><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('type') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/info.php b/modules/cms/ui/themes/default/html/views/pageelement/info.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/link.php b/modules/cms/ui/themes/default/html/views/pageelement/link.php @@ -15,7 +15,7 @@ </tr> <tr><?php echo O::escapeHtml('') ?> <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('linkobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('linkobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($objects as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkobjectid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/prop.php b/modules/cms/ui/themes/default/html/views/pageelement/prop.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> @@ -124,7 +124,7 @@ <td><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/value.php b/modules/cms/ui/themes/default/html/views/pageelement/value.php @@ -26,12 +26,12 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('date') ?> </span> - <input name="<?php echo O::escapeHtml('date') ?>" type="<?php echo O::escapeHtml('date') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$date.'') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('date') ?>" type="<?php echo O::escapeHtml('date') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$date.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('time') ?> </span> - <input name="<?php echo O::escapeHtml('time') ?>" type="<?php echo O::escapeHtml('time') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$time.'') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('time') ?>" type="<?php echo O::escapeHtml('time') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$time.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> </div> </div> @@ -40,9 +40,7 @@ <?php $if1=($type=='text'); if($if1) { ?> <tr><?php echo O::escapeHtml('') ?> <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('text') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" class="<?php echo O::escapeHtml('text') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('text') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" class="<?php echo O::escapeHtml('text or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <?php } ?> @@ -104,7 +102,7 @@ <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> @@ -212,9 +210,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('linkurl') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$linkurl.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('linkurl') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$linkurl.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -224,7 +220,7 @@ <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('linkobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('linkobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($objects as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkobjectid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -238,7 +234,7 @@ <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('linkobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('linkobjectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($objects as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkobjectid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -253,9 +249,7 @@ <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('decimals') ?>" value="<?php echo O::escapeHtml('decimals') ?>" /><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('number') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('20') ?>" value="<?php echo O::escapeHtml(''.@$number.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('number') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('20') ?>" value="<?php echo O::escapeHtml(''.@$number.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </fieldset> @@ -264,7 +258,7 @@ <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('text') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('text') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($items as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$text){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/profile/confirmmail.php b/modules/cms/ui/themes/default/html/views/profile/confirmmail.php @@ -24,9 +24,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('code') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('code') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/profile/edit.php b/modules/cms/ui/themes/default/html/views/profile/edit.php @@ -72,9 +72,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('fullname') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$fullname.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('fullname') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$fullname.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -83,9 +81,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('tel') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$tel.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('tel') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$tel.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -94,9 +90,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('desc') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$desc.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('desc') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$desc.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -105,7 +99,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('style') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-theme-chooser') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('style') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-theme-chooser or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($allstyles as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$style){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -121,7 +115,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('timezone') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('timezone') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($timezone_list as $_key=>$_value) { ?> @@ -139,7 +133,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('language') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('language') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($language_list as $_key=>$_value) { ?> diff --git a/modules/cms/ui/themes/default/html/views/profile/edit.tpl.src.html b/modules/cms/ui/themes/default/html/views/profile/edit.tpl.src.html @@ -1,57 +0,0 @@ -<template xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:m="http://www.w3.org/1998/Math/MathML" - xmlns:or="http://www.openrat.de/template"> -<or:form></or:form> -<html:div></html:div> -</template> - -<!-- -dummy - header views:mail - form method:post - window icon:user name:user_profile - row - cell colspan:2 - fieldset title:message:name - part - label for:name - text key:user_username - text var:name class:name - - fieldset title:message:MENU_PROFILE_MAIL - part - label for:mail - text text:user_mail - #link action:profile subaction:mail title:message:menu_mail_desc - text var:mail class:filename - if false:mode:edit - newline - link type:view class:action action:profile subaction:mail - text key:edit - - fieldset title:message:GLOBAL_PROP - part - label for:fullname - text text:user_fullname class:name - input name:fullname size:40 maxlength:128 - part - label for:tel - text text:user_tel - input name:tel size:40 maxlength:128 - - part - label for:desc - text text:user_desc - input name:desc size:40 maxlength:128 - - part - label for:style - text text:user_style - selectbox name:style list:allstyles default:config:interface/style/default - - row - cell colspan:2 class:act - button type:ok - focus field:fullname - --> - diff --git a/modules/cms/ui/themes/default/html/views/profile/history.php b/modules/cms/ui/themes/default/html/views/profile/history.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/profile/mail.php b/modules/cms/ui/themes/default/html/views/profile/mail.php @@ -35,9 +35,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$mail.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$mail.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/profile/memberships.php b/modules/cms/ui/themes/default/html/views/profile/memberships.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/profile/pw.php b/modules/cms/ui/themes/default/html/views/profile/pw.php @@ -36,9 +36,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('act_password') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$act_password.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('act_password') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$act_password.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -60,9 +58,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password1') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password1.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password1') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password1.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -73,9 +69,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password2') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password2.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password2') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password2.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/project/add.php b/modules/cms/ui/themes/default/html/views/project/add.php @@ -13,9 +13,7 @@ </span> </td> <td><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </td> </tr> <tr><?php echo O::escapeHtml('') ?> @@ -42,7 +40,7 @@ <span><?php echo O::escapeHtml(''.@O::lang('copy').'') ?> </span> </label> - <select name="<?php echo O::escapeHtml('projectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('projectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($projects as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$projectid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/project/edit.php b/modules/cms/ui/themes/default/html/views/project/edit.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/project/export.php b/modules/cms/ui/themes/default/html/views/project/export.php @@ -13,7 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($dbids as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/project/history.php b/modules/cms/ui/themes/default/html/views/project/history.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/project/prop.php b/modules/cms/ui/themes/default/html/views/project/prop.php @@ -22,9 +22,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('name') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('name or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -33,9 +31,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -55,9 +51,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('target_dir') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$target_dir.'') ?>" class="<?php echo O::escapeHtml('filename') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('target_dir') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$target_dir.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php $if1=(\cms\base\Configuration::config('publish','project','override_system_command')); if($if1) { ?> @@ -67,9 +61,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('cmd_after_publish') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$cmd_after_publish.'') ?>" class="<?php echo O::escapeHtml('filename') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('cmd_after_publish') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$cmd_after_publish.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php } ?> @@ -119,9 +111,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('ftp_url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$ftp_url.'') ?>" class="<?php echo O::escapeHtml('filename') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('ftp_url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$ftp_url.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> <br /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('ftp_passive') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$ftp_passive){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_FTP_PASSIVE').'') ?> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/add.php b/modules/cms/ui/themes/default/html/views/projectlist/add.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -42,7 +40,7 @@ <span><?php echo O::escapeHtml(''.@O::lang('copy').'') ?> </span> </label> - <select name="<?php echo O::escapeHtml('projectid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('projectid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($projects as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==''){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/edit.php b/modules/cms/ui/themes/default/html/views/projectlist/edit.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/history.php b/modules/cms/ui/themes/default/html/views/projectlist/history.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/search/edit.php b/modules/cms/ui/themes/default/html/views/search/edit.php @@ -16,9 +16,7 @@ <br /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('text') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('search').'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('text') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('search').'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/search/result.php b/modules/cms/ui/themes/default/html/views/search/result.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/start/applications.php b/modules/cms/ui/themes/default/html/views/start/applications.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/start/projectmenu.php b/modules/cms/ui/themes/default/html/views/start/projectmenu.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> @@ -50,7 +50,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/start/userprojecttimeline.php b/modules/cms/ui/themes/default/html/views/start/userprojecttimeline.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/addel.php b/modules/cms/ui/themes/default/html/views/template/addel.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -26,7 +24,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $text= 'text'; ?> <?php } ?> - <select name="<?php echo O::escapeHtml('typeid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('typeid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/template/edit.php b/modules/cms/ui/themes/default/html/views/template/edit.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/extension.php b/modules/cms/ui/themes/default/html/views/template/extension.php @@ -22,7 +22,7 @@ <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml('template_extension') ?> </span> - <input name="<?php echo O::escapeHtml(''.@$name.'') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('10') ?>" value="<?php echo O::escapeHtml(''.@$'['@$name']['''].'') ?>" /><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml(''.@$name.'') ?>" required="<?php echo O::escapeHtml('required') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('10') ?>" value="<?php echo O::escapeHtml(''.@$'['@$name']['''].'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </label> </div> </fieldset> diff --git a/modules/cms/ui/themes/default/html/views/template/listing.php b/modules/cms/ui/themes/default/html/views/template/listing.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/preview.php b/modules/cms/ui/themes/default/html/views/template/preview.php @@ -7,7 +7,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('template') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('preview') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('modelid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('modelid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($models as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$modelid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/template/prop.php b/modules/cms/ui/themes/default/html/views/template/prop.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -29,7 +27,7 @@ </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('view') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('extension') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#//') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$extension.'') ?> </span> </div> @@ -49,7 +47,7 @@ </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <a target="<?php echo O::escapeHtml('_self') ?>" data-action="<?php echo O::escapeHtml('template') ?>" data-method="<?php echo O::escapeHtml('extension') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/template/') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$mime_type.'') ?> </span> </div> diff --git a/modules/cms/ui/themes/default/html/views/template/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/prop.tpl.src.xml @@ -17,7 +17,7 @@ </part> <part class="input"> <link type="view" subaction="extension"> - <part class="inputholder"> + <part> <text value="${extension}"></text> </part> </link> @@ -35,7 +35,7 @@ </part> <part class="input"> <link action="template" subaction="extension"> - <part class="inputholder"> + <part> <text value="${mime_type}"></text> </part> </link> diff --git a/modules/cms/ui/themes/default/html/views/template/srcelement.php b/modules/cms/ui/themes/default/html/views/template/srcelement.php @@ -17,7 +17,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('elementid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('elementid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($elements as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$elementid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -40,7 +40,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('writable_elementid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('writable_elementid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($writable_elements as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$writable_elementid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/templatelist/add.php b/modules/cms/ui/themes/default/html/views/templatelist/add.php @@ -13,9 +13,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('50') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -47,7 +45,7 @@ <input type="<?php echo O::escapeHtml('radio') ?>" name="<?php echo O::escapeHtml('type') ?>" value="<?php echo O::escapeHtml('copy') ?>" <?php if(@$type=='copy'){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('templateid') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('templateid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($templates as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$templateid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -64,7 +62,7 @@ <input type="<?php echo O::escapeHtml('radio') ?>" name="<?php echo O::escapeHtml('type') ?>" value="<?php echo O::escapeHtml('example') ?>" <?php if(@$type=='example'){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('example') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('example') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($examples as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$example){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/templatelist/show.php b/modules/cms/ui/themes/default/html/views/templatelist/show.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/text/compress.php b/modules/cms/ui/themes/default/html/views/text/compress.php @@ -24,7 +24,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $gz= gz; ?> <?php } ?> - <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==gz){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/text/size.php b/modules/cms/ui/themes/default/html/views/text/size.php @@ -40,7 +40,7 @@ <span><?php echo O::escapeHtml(''.@O::lang('FILE_IMAGE_SIZE_FACTOR').'') ?> </span> </label> - <select name="<?php echo O::escapeHtml('factor') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('factor') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($factors as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$factor){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -63,14 +63,10 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('width') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$width.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(' * ') ?> </span> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('height') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$height.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> @@ -92,7 +88,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('format') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> @@ -110,7 +106,7 @@ <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> <?php { $jpeg_compression= 70; ?> <?php } ?> - <select name="<?php echo O::escapeHtml('jpeg_compression') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('jpeg_compression') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($jpeglist as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$jpeg_compression){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/title/show.php b/modules/cms/ui/themes/default/html/views/title/show.php @@ -427,9 +427,7 @@ <div class="<?php echo O::escapeHtml('toolbar-icon menu search') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('image-icon image-icon--method-search') ?>"><?php echo O::escapeHtml('') ?> </i> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('text') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('search').'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('text') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('search').'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('arrow arrow-down') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('dropdown') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/url/edit.php b/modules/cms/ui/themes/default/html/views/url/edit.php @@ -15,9 +15,7 @@ </span> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$url.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/user/add.php b/modules/cms/ui/themes/default/html/views/user/add.php @@ -13,9 +13,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/user/history.php b/modules/cms/ui/themes/default/html/views/user/history.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/listing.php b/modules/cms/ui/themes/default/html/views/user/listing.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/memberships.php b/modules/cms/ui/themes/default/html/views/user/memberships.php @@ -9,7 +9,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/prop.php b/modules/cms/ui/themes/default/html/views/user/prop.php @@ -13,9 +13,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('name,focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('name,focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> @@ -33,9 +31,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('fullname') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$fullname.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('fullname') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$fullname.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <?php $if1=(\cms\base\Configuration::config('security','user','show_admin_mail')); if($if1) { ?> @@ -45,9 +41,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$mail.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$mail.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <i data-qrcode="<?php echo O::escapeHtml('mailto:'.@$mail.'') ?>" title="<?php echo O::escapeHtml(''.@O::lang('QRCODE_SHOW').'') ?>" class="<?php echo O::escapeHtml('image-icon image-icon--menu-qrcode or-qrcode or-info') ?>"><?php echo O::escapeHtml('') ?> </i> </div> @@ -59,9 +53,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('desc') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$desc.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('desc') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$desc.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -70,9 +62,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('tel') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$tel.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('tel') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$tel.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> <i data-qrcode="<?php echo O::escapeHtml('tel:'.@$tel.'') ?>" title="<?php echo O::escapeHtml(''.@O::lang('QRCODE_SHOW').'') ?>" class="<?php echo O::escapeHtml('image-icon image-icon--menu-qrcode or-qrcode or-info') ?>"><?php echo O::escapeHtml('') ?> </i> </div> @@ -85,7 +75,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('timezone') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('timezone') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($timezone_list as $_key=>$_value) { ?> @@ -103,7 +93,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('language') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('language') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <option value="<?php echo O::escapeHtml('') ?>"><?php echo O::escapeHtml(''.@O::lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($language_list as $_key=>$_value) { ?> @@ -139,9 +129,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('ldap_dn') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$ldap_dn.'') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('ldap_dn') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$ldap_dn.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -150,7 +138,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('style') ?>" size="<?php echo O::escapeHtml('1') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('style') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> <?php foreach($allstyles as $_key=>$_value) { ?> <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$style){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> </option> diff --git a/modules/cms/ui/themes/default/html/views/user/pw.php b/modules/cms/ui/themes/default/html/views/user/pw.php @@ -49,9 +49,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password1') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password1.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password1') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password1.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> @@ -60,9 +58,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password2') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password2.'') ?>" class="<?php echo O::escapeHtml('') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password2') ?>" size="<?php echo O::escapeHtml('40') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password2.'') ?>" class="<?php echo O::escapeHtml(' or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.php b/modules/cms/ui/themes/default/html/views/user/rights.php @@ -18,7 +18,7 @@ <?php $if1=!(($rights)==FALSE); if($if1) { ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/usergroup/show.php b/modules/cms/ui/themes/default/html/views/usergroup/show.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/userlist/add.php b/modules/cms/ui/themes/default/html/views/userlist/add.php @@ -13,9 +13,7 @@ </label> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('inputholder') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus') ?>" /><?php echo O::escapeHtml('') ?> - </div> + <input name="<?php echo O::escapeHtml('name') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$name.'') ?>" class="<?php echo O::escapeHtml('focus or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/userlist/show.php b/modules/cms/ui/themes/default/html/views/userlist/show.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/script/openrat.js b/modules/cms/ui/themes/default/script/openrat.js @@ -343,7 +343,7 @@ jQuery.fn.orTree = function () }).fail(function () { // Ups... aber was können wir hier schon tun, außer hässliche Meldungen anzeigen. - Openrat.Workbench.notify('','','ERROR','Failed to load subtree',[],false); + Openrat.Workbench.notify('', 0, '', 'ERROR', 'Failed to load subtree', [], false); }).always(function () { // Die Loader-Animation entfernen. @@ -1637,7 +1637,7 @@ Openrat.View = function( action,method,id,params ) { loadViewHtmlPromise.fail( function(jqxhr,status,cause) { $(element).html(""); - Openrat.Workbench.notify('','','error','Server Error',['Server Error while requesting url '+url, status]); + Openrat.Workbench.notify('', 0, '', 'error', 'Server Error', ['Server Error while requesting url ' + url, status]); }); // Load the data for this view. @@ -1813,7 +1813,7 @@ Openrat.Form = function() { // Alle vorhandenen Error-Marker entfernen. // Falls wieder ein Fehler auftritt, werden diese erneut gesetzt. - $(this.element).find('.error').removeClass('error'); + $(this.element).find('.or-input.error').removeClass('error'); let params = $(this.element).serializeArray(); let data = {}; @@ -1893,12 +1893,12 @@ Openrat.Form = function() { try { let error = jQuery.parseJSON( jqXHR.responseText ); - Openrat.Workbench.notify('','','error',error.error,[error.description]); + Openrat.Workbench.notify('', 0, '', 'error', error.error, [error.description]); } catch( e ) { let msg = jqXHR.responseText; - Openrat.Workbench.notify('','','error','Server Error',[msg]); + Openrat.Workbench.notify('', 0, '', 'error', 'Server Error', [msg]); } @@ -1936,7 +1936,7 @@ Openrat.Form = function() { // gewechselt hat. let notifyBrowser = $(element).data('async'); - Openrat.Workbench.notify(value.type, value.name, value.status, value.text, value.log, notifyBrowser ); // Notice anhängen. + Openrat.Workbench.notify(value.type, value.id, value.name, value.status, value.text, value.log, notifyBrowser); // Notice anhängen. if ( value.status == 'ok' ) // Kein Fehler? { @@ -1949,17 +1949,12 @@ Openrat.Form = function() { } }); - // Felder mit Fehleingaben markieren, ggf. das übergeordnete Fieldset aktivieren. + // Validation error should mark the input field. $.each(data['errors'], function(idx,value) { - $('input[name='+value+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open'); + $('.or-input[name='+value+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open'); }); // Jetzt das erhaltene Dokument auswerten. - - - if ( data.control.redirect ) - // Redirect - window.location.href = data.control.redirect; } @@ -2310,7 +2305,7 @@ Openrat.Workbench = new function() * @param msg * @param log */ - this.notify = function( type,name,status,msg,log=[],notifyTheBrowser=false ) + this.notify = function (type, id, name, status, msg, log = [], notifyTheBrowser = false) { // Notice-Bar mit dieser Meldung erweitern. @@ -2325,9 +2320,8 @@ Openrat.Workbench = new function() $(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>'); $(notice).append(toolbar); - let id = 0; // TODO id of objects to click on if (name) - $(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+type+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+type+'"></i> '+name+'</a></div>'); + $(notice).append('<div class="name clickable"><a href="'+Openrat.Navigator.createShortUrl(type,id)+'" data-type="open" data-action="'+type+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+type+'"></i> '+name+'</a></div>'); $(notice).append( '<div class="text">'+htmlEntities(msg)+'</div>'); @@ -2691,7 +2685,7 @@ $( function() { // Initial Notices $('.or-initial-notice').each( function() { - Openrat.Workbench.notify('','','info',$(this).text()); + Openrat.Workbench.notify('', 0, '', 'info', $(this).text()); $(this).remove(); }); @@ -3423,7 +3417,7 @@ Openrat.Workbench.handleFileUpload = function(form,files) msg = jqXHR.responseText; } - Openrat.Workbench.notify('Upload error',msg); + Openrat.Workbench.notify('Upload error', 0, msg); } } ); diff --git a/modules/cms/ui/themes/default/script/openrat.min.js b/modules/cms/ui/themes/default/script/openrat.min.js @@ -119,7 +119,7 @@ else{$(dropdownEl).empty()}})}; ;jQuery.fn.orTree=function(){let registerTreeBranchEvents=function(e){Openrat.Workbench.registerDraggable(e)};$(this).each(function(n,e){$(e).children('.or-navtree-node-control').click(function(){let $node=$(this).parent('.or-navtree-node');if($node.is('.or-navtree-node--is-open')){$node.children('ul').slideUp('fast').remove();$node.removeClass('or-navtree-node--is-open').addClass('or-navtree-node--is-closed').find('.tree-icon').removeClass('image-icon--node-open').addClass('image-icon--node-closed')} else{$(e).closest('div.view').addClass('loader');let $link=$node.find('a');let id=$link.data('id');let extraId=$link.data('extra');let loadBranchUrl='./?action=tree&subaction=branch&id='+id+'';if(typeof extraId==='string'){jQuery.each(jQuery.parseJSON(extraId.replace(/'/g,'"')),function(e,n){loadBranchUrl=loadBranchUrl+'&'+e+'='+n})} else if(typeof extraId==='object'){jQuery.each(extraId,function(e,n){loadBranchUrl=loadBranchUrl+'&'+e+'='+n})} -else{};$.get(loadBranchUrl).done(function(n){let $ul=$('<ul class="or-navtree-list" />');$(e).append($ul);$ul.append(n);$ul.find('li').orTree();registerTreeBranchEvents($ul);$ul.find('.clickable').orLinkify();$ul.slideDown('fast')}).fail(function(){Openrat.Workbench.notify('','','ERROR','Failed to load subtree',[],!1)}).always(function(){$(e).closest('div.view').removeClass('loader')});$node.addClass('or-navtree-node--is-open').removeClass('or-navtree-node--is-closed').find('.tree-icon').addClass('image-icon--node-open').removeClass('image-icon--node-closed')}})})}; +else{};$.get(loadBranchUrl).done(function(n){let $ul=$('<ul class="or-navtree-list" />');$(e).append($ul);$ul.append(n);$ul.find('li').orTree();registerTreeBranchEvents($ul);$ul.find('.clickable').orLinkify();$ul.slideDown('fast')}).fail(function(){Openrat.Workbench.notify('',0,'','ERROR','Failed to load subtree',[],!1)}).always(function(){$(e).closest('div.view').removeClass('loader')});$node.addClass('or-navtree-node--is-open').removeClass('or-navtree-node--is-closed').find('.tree-icon').addClass('image-icon--node-open').removeClass('image-icon--node-closed')}})})}; ;jQuery.fn.orAutoheight=function(){var t=function(t){var n=$(t).val().split('\n').length;$(t).attr('rows',n+3)};$(this).each(function(n){t(this)});return $(this).keypress(function(){t(this)})}; /*! jquery-qrcode v0.14.0 - https://larsjung.de/jquery-qrcode/ */ !function(r){"use strict";function t(t,e,n,o){function a(r,t){return r-=o,t-=o,0>r||r>=c||0>t||t>=c?!1:f.isDark(r,t)}function i(r,t,e,n){var o=u.isDark,a=1/l;u.isDark=function(i,u){var f=u*a,c=i*a,l=f+a,g=c+a;return o(i,u)&&(r>l||f>e||t>g||c>n)}}var u={},f=r(n,e);f.addData(t),f.make(),o=o||0;var c=f.getModuleCount(),l=f.getModuleCount()+2*o;return u.text=t,u.level=e,u.version=n,u.moduleCount=l,u.isDark=a,u.addBlank=i,u}function e(r,e,n,o,a){n=Math.max(1,n||1),o=Math.min(40,o||40);for(var i=n;o>=i;i+=1)try{return t(r,e,i,a)}catch(u){}}function n(r,t,e){var n=e.size,o="bold "+e.mSize*n+"px "+e.fontname,a=w("<canvas/>")[0].getContext("2d");a.font=o;var i=a.measureText(e.label).width,u=e.mSize,f=i/n,c=(1-f)*e.mPosX,l=(1-u)*e.mPosY,g=c+f,s=l+u,v=.01;1===e.mode?r.addBlank(0,l-v,n,s+v):r.addBlank(c-v,l-v,g+v,s+v),t.fillStyle=e.fontcolor,t.font=o,t.fillText(e.label,c*n,l*n+.75*e.mSize*n)}function o(r,t,e){var n=e.size,o=e.image.naturalWidth||1,a=e.image.naturalHeight||1,i=e.mSize,u=i*o/a,f=(1-u)*e.mPosX,c=(1-i)*e.mPosY,l=f+u,g=c+i,s=.01;3===e.mode?r.addBlank(0,c-s,n,g+s):r.addBlank(f-s,c-s,l+s,g+s),t.drawImage(e.image,f*n,c*n,u*n,i*n)}function a(r,t,e){w(e.background).is("img")?t.drawImage(e.background,0,0,e.size,e.size):e.background&&(t.fillStyle=e.background,t.fillRect(e.left,e.top,e.size,e.size));var a=e.mode;1===a||2===a?n(r,t,e):(3===a||4===a)&&o(r,t,e)}function i(r,t,e,n,o,a,i,u){r.isDark(i,u)&&t.rect(n,o,a,a)}function u(r,t,e,n,o,a,i,u,f,c){i?r.moveTo(t+a,e):r.moveTo(t,e),u?(r.lineTo(n-a,e),r.arcTo(n,e,n,o,a)):r.lineTo(n,e),f?(r.lineTo(n,o-a),r.arcTo(n,o,t,o,a)):r.lineTo(n,o),c?(r.lineTo(t+a,o),r.arcTo(t,o,t,e,a)):r.lineTo(t,o),i?(r.lineTo(t,e+a),r.arcTo(t,e,n,e,a)):r.lineTo(t,e)}function f(r,t,e,n,o,a,i,u,f,c){i&&(r.moveTo(t+a,e),r.lineTo(t,e),r.lineTo(t,e+a),r.arcTo(t,e,t+a,e,a)),u&&(r.moveTo(n-a,e),r.lineTo(n,e),r.lineTo(n,e+a),r.arcTo(n,e,n-a,e,a)),f&&(r.moveTo(n-a,o),r.lineTo(n,o),r.lineTo(n,o-a),r.arcTo(n,o,n-a,o,a)),c&&(r.moveTo(t+a,o),r.lineTo(t,o),r.lineTo(t,o-a),r.arcTo(t,o,t+a,o,a))}function c(r,t,e,n,o,a,i,c){var l=r.isDark,g=n+a,s=o+a,v=e.radius*a,h=i-1,d=i+1,w=c-1,m=c+1,y=l(i,c),T=l(h,w),p=l(h,c),B=l(h,m),A=l(i,m),E=l(d,m),k=l(d,c),M=l(d,w),C=l(i,w);y?u(t,n,o,g,s,v,!p&&!C,!p&&!A,!k&&!A,!k&&!C):f(t,n,o,g,s,v,p&&C&&T,p&&A&&B,k&&A&&E,k&&C&&M)}function l(r,t,e){var n,o,a=r.moduleCount,u=e.size/a,f=i;for(e.radius>0&&e.radius<=.5&&(f=c),t.beginPath(),n=0;a>n;n+=1)for(o=0;a>o;o+=1){var l=e.left+o*u,g=e.top+n*u,s=u;f(r,t,e,l,g,s,n,o)}if(w(e.fill).is("img")){t.strokeStyle="rgba(0,0,0,0.5)",t.lineWidth=2,t.stroke();var v=t.globalCompositeOperation;t.globalCompositeOperation="destination-out",t.fill(),t.globalCompositeOperation=v,t.clip(),t.drawImage(e.fill,0,0,e.size,e.size),t.restore()}else t.fillStyle=e.fill,t.fill()}function g(r,t){var n=e(t.text,t.ecLevel,t.minVersion,t.maxVersion,t.quiet);if(!n)return null;var o=w(r).data("qrcode",n),i=o[0].getContext("2d");return a(n,i,t),l(n,i,t),o}function s(r){var t=w("<canvas/>").attr("width",r.size).attr("height",r.size);return g(t,r)}function v(r){return w("<img/>").attr("src",s(r)[0].toDataURL("image/png"))}function h(r){var t=e(r.text,r.ecLevel,r.minVersion,r.maxVersion,r.quiet);if(!t)return null;var n,o,a=r.size,i=r.background,u=Math.floor,f=t.moduleCount,c=u(a/f),l=u(.5*(a-c*f)),g={position:"relative",left:0,top:0,padding:0,margin:0,width:a,height:a},s={position:"absolute",padding:0,margin:0,width:c,height:c,"background-color":r.fill},v=w("<div/>").data("qrcode",t).css(g);for(i&&v.css("background-color",i),n=0;f>n;n+=1)for(o=0;f>o;o+=1)t.isDark(n,o)&&w("<div/>").css(s).css({left:l+o*c,top:l+n*c}).appendTo(v);return v}function d(r){return m&&"canvas"===r.render?s(r):m&&"image"===r.render?v(r):h(r)}var w=window.jQuery,m=function(){var r=document.createElement("canvas");return!(!r.getContext||!r.getContext("2d"))}(),y={render:"canvas",minVersion:1,maxVersion:40,ecLevel:"L",left:0,top:0,size:200,fill:"#000",background:null,text:"no text",radius:0,quiet:0,mode:0,mSize:.1,mPosX:.5,mPosY:.5,label:"no label",fontname:"sans",fontcolor:"#000",image:null};w.fn.qrcode=function(r){var t=w.extend({},y,r);return this.each(function(r,e){"canvas"===e.nodeName.toLowerCase()?g(e,t):w(e).append(d(t))})}}(function(){var r=function(){function r(t,e){if("undefined"==typeof t.length)throw new Error(t.length+"/"+e);var n=function(){for(var r=0;r<t.length&&0==t[r];)r+=1;for(var n=new Array(t.length-r+e),o=0;o<t.length-r;o+=1)n[o]=t[o+r];return n}(),o={};return o.getAt=function(r){return n[r]},o.getLength=function(){return n.length},o.multiply=function(t){for(var e=new Array(o.getLength()+t.getLength()-1),n=0;n<o.getLength();n+=1)for(var a=0;a<t.getLength();a+=1)e[n+a]^=i.gexp(i.glog(o.getAt(n))+i.glog(t.getAt(a)));return r(e,0)},o.mod=function(t){if(o.getLength()-t.getLength()<0)return o;for(var e=i.glog(o.getAt(0))-i.glog(t.getAt(0)),n=new Array(o.getLength()),a=0;a<o.getLength();a+=1)n[a]=o.getAt(a);for(var a=0;a<t.getLength();a+=1)n[a]^=i.gexp(i.glog(t.getAt(a))+e);return r(n,0).mod(t)},o}var t=function(t,e){var o=236,i=17,l=t,g=n[e],s=null,v=0,d=null,w=new Array,m={},y=function(r,t){v=4*l+17,s=function(r){for(var t=new Array(r),e=0;r>e;e+=1){t[e]=new Array(r);for(var n=0;r>n;n+=1)t[e][n]=null}return t}(v),T(0,0),T(v-7,0),T(0,v-7),A(),B(),k(r,t),l>=7&&E(r),null==d&&(d=D(l,g,w)),M(d,t)},T=function(r,t){for(var e=-1;7>=e;e+=1)if(!(-1>=r+e||r+e>=v))for(var n=-1;7>=n;n+=1)-1>=t+n||t+n>=v||(e>=0&&6>=e&&(0==n||6==n)||n>=0&&6>=n&&(0==e||6==e)||e>=2&&4>=e&&n>=2&&4>=n?s[r+e][t+n]=!0:s[r+e][t+n]=!1)},p=function(){for(var r=0,t=0,e=0;8>e;e+=1){y(!0,e);var n=a.getLostPoint(m);(0==e||r>n)&&(r=n,t=e)}return t},B=function(){for(var r=8;v-8>r;r+=1)null==s[r][6]&&(s[r][6]=r%2==0);for(var t=8;v-8>t;t+=1)null==s[6][t]&&(s[6][t]=t%2==0)},A=function(){for(var r=a.getPatternPosition(l),t=0;t<r.length;t+=1)for(var e=0;e<r.length;e+=1){var n=r[t],o=r[e];if(null==s[n][o])for(var i=-2;2>=i;i+=1)for(var u=-2;2>=u;u+=1)-2==i||2==i||-2==u||2==u||0==i&&0==u?s[n+i][o+u]=!0:s[n+i][o+u]=!1}},E=function(r){for(var t=a.getBCHTypeNumber(l),e=0;18>e;e+=1){var n=!r&&1==(t>>e&1);s[Math.floor(e/3)][e%3+v-8-3]=n}for(var e=0;18>e;e+=1){var n=!r&&1==(t>>e&1);s[e%3+v-8-3][Math.floor(e/3)]=n}},k=function(r,t){for(var e=g<<3|t,n=a.getBCHTypeInfo(e),o=0;15>o;o+=1){var i=!r&&1==(n>>o&1);6>o?s[o][8]=i:8>o?s[o+1][8]=i:s[v-15+o][8]=i}for(var o=0;15>o;o+=1){var i=!r&&1==(n>>o&1);8>o?s[8][v-o-1]=i:9>o?s[8][15-o-1+1]=i:s[8][15-o-1]=i}s[v-8][8]=!r},M=function(r,t){for(var e=-1,n=v-1,o=7,i=0,u=a.getMaskFunction(t),f=v-1;f>0;f-=2)for(6==f&&(f-=1);;){for(var c=0;2>c;c+=1)if(null==s[n][f-c]){var l=!1;i<r.length&&(l=1==(r[i]>>>o&1));var g=u(n,f-c);g&&(l=!l),s[n][f-c]=l,o-=1,-1==o&&(i+=1,o=7)}if(n+=e,0>n||n>=v){n-=e,e=-e;break}}},C=function(t,e){for(var n=0,o=0,i=0,u=new Array(e.length),f=new Array(e.length),c=0;c<e.length;c+=1){var l=e[c].dataCount,g=e[c].totalCount-l;o=Math.max(o,l),i=Math.max(i,g),u[c]=new Array(l);for(var s=0;s<u[c].length;s+=1)u[c][s]=255&t.getBuffer()[s+n];n+=l;var v=a.getErrorCorrectPolynomial(g),h=r(u[c],v.getLength()-1),d=h.mod(v);f[c]=new Array(v.getLength()-1);for(var s=0;s<f[c].length;s+=1){var w=s+d.getLength()-f[c].length;f[c][s]=w>=0?d.getAt(w):0}}for(var m=0,s=0;s<e.length;s+=1)m+=e[s].totalCount;for(var y=new Array(m),T=0,s=0;o>s;s+=1)for(var c=0;c<e.length;c+=1)s<u[c].length&&(y[T]=u[c][s],T+=1);for(var s=0;i>s;s+=1)for(var c=0;c<e.length;c+=1)s<f[c].length&&(y[T]=f[c][s],T+=1);return y},D=function(r,t,e){for(var n=u.getRSBlocks(r,t),c=f(),l=0;l<e.length;l+=1){var g=e[l];c.put(g.getMode(),4),c.put(g.getLength(),a.getLengthInBits(g.getMode(),r)),g.write(c)}for(var s=0,l=0;l<n.length;l+=1)s+=n[l].dataCount;if(c.getLengthInBits()>8*s)throw new Error("code length overflow. ("+c.getLengthInBits()+">"+8*s+")");for(c.getLengthInBits()+4<=8*s&&c.put(0,4);c.getLengthInBits()%8!=0;)c.putBit(!1);for(;;){if(c.getLengthInBits()>=8*s)break;if(c.put(o,8),c.getLengthInBits()>=8*s)break;c.put(i,8)}return C(c,n)};return m.addData=function(r){var t=c(r);w.push(t),d=null},m.isDark=function(r,t){if(0>r||r>=v||0>t||t>=v)throw new Error(r+","+t);return s[r][t]},m.getModuleCount=function(){return v},m.make=function(){y(!1,p())},m.createTableTag=function(r,t){r=r||2,t="undefined"==typeof t?4*r:t;var e="";e+='<table style="',e+=" border-width: 0px; border-style: none;",e+=" border-collapse: collapse;",e+=" padding: 0px; margin: "+t+"px;",e+='">',e+="<tbody>";for(var n=0;n<m.getModuleCount();n+=1){e+="<tr>";for(var o=0;o<m.getModuleCount();o+=1)e+='<td style="',e+=" border-width: 0px; border-style: none;",e+=" border-collapse: collapse;",e+=" padding: 0px; margin: 0px;",e+=" width: "+r+"px;",e+=" height: "+r+"px;",e+=" background-color: ",e+=m.isDark(n,o)?"#000000":"#ffffff",e+=";",e+='"/>';e+="</tr>"}return e+="</tbody>",e+="</table>"},m.createImgTag=function(r,t){r=r||2,t="undefined"==typeof t?4*r:t;var e=m.getModuleCount()*r+2*t,n=t,o=e-t;return h(e,e,function(t,e){if(t>=n&&o>t&&e>=n&&o>e){var a=Math.floor((t-n)/r),i=Math.floor((e-n)/r);return m.isDark(i,a)?0:1}return 1})},m};t.stringToBytes=function(r){for(var t=new Array,e=0;e<r.length;e+=1){var n=r.charCodeAt(e);t.push(255&n)}return t},t.createStringToBytes=function(r,t){var e=function(){for(var e=s(r),n=function(){var r=e.read();if(-1==r)throw new Error;return r},o=0,a={};;){var i=e.read();if(-1==i)break;var u=n(),f=n(),c=n(),l=String.fromCharCode(i<<8|u),g=f<<8|c;a[l]=g,o+=1}if(o!=t)throw new Error(o+" != "+t);return a}(),n="?".charCodeAt(0);return function(r){for(var t=new Array,o=0;o<r.length;o+=1){var a=r.charCodeAt(o);if(128>a)t.push(a);else{var i=e[r.charAt(o)];"number"==typeof i?(255&i)==i?t.push(i):(t.push(i>>>8),t.push(255&i)):t.push(n)}}return t}};var e={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},n={L:1,M:0,Q:3,H:2},o={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},a=function(){var t=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],n=1335,a=7973,u=21522,f={},c=function(r){for(var t=0;0!=r;)t+=1,r>>>=1;return t};return f.getBCHTypeInfo=function(r){for(var t=r<<10;c(t)-c(n)>=0;)t^=n<<c(t)-c(n);return(r<<10|t)^u},f.getBCHTypeNumber=function(r){for(var t=r<<12;c(t)-c(a)>=0;)t^=a<<c(t)-c(a);return r<<12|t},f.getPatternPosition=function(r){return t[r-1]},f.getMaskFunction=function(r){switch(r){case o.PATTERN000:return function(r,t){return(r+t)%2==0};case o.PATTERN001:return function(r,t){return r%2==0};case o.PATTERN010:return function(r,t){return t%3==0};case o.PATTERN011:return function(r,t){return(r+t)%3==0};case o.PATTERN100:return function(r,t){return(Math.floor(r/2)+Math.floor(t/3))%2==0};case o.PATTERN101:return function(r,t){return r*t%2+r*t%3==0};case o.PATTERN110:return function(r,t){return(r*t%2+r*t%3)%2==0};case o.PATTERN111:return function(r,t){return(r*t%3+(r+t)%2)%2==0};default:throw new Error("bad maskPattern:"+r)}},f.getErrorCorrectPolynomial=function(t){for(var e=r([1],0),n=0;t>n;n+=1)e=e.multiply(r([1,i.gexp(n)],0));return e},f.getLengthInBits=function(r,t){if(t>=1&&10>t)switch(r){case e.MODE_NUMBER:return 10;case e.MODE_ALPHA_NUM:return 9;case e.MODE_8BIT_BYTE:return 8;case e.MODE_KANJI:return 8;default:throw new Error("mode:"+r)}else if(27>t)switch(r){case e.MODE_NUMBER:return 12;case e.MODE_ALPHA_NUM:return 11;case e.MODE_8BIT_BYTE:return 16;case e.MODE_KANJI:return 10;default:throw new Error("mode:"+r)}else{if(!(41>t))throw new Error("type:"+t);switch(r){case e.MODE_NUMBER:return 14;case e.MODE_ALPHA_NUM:return 13;case e.MODE_8BIT_BYTE:return 16;case e.MODE_KANJI:return 12;default:throw new Error("mode:"+r)}}},f.getLostPoint=function(r){for(var t=r.getModuleCount(),e=0,n=0;t>n;n+=1)for(var o=0;t>o;o+=1){for(var a=0,i=r.isDark(n,o),u=-1;1>=u;u+=1)if(!(0>n+u||n+u>=t))for(var f=-1;1>=f;f+=1)0>o+f||o+f>=t||(0!=u||0!=f)&&i==r.isDark(n+u,o+f)&&(a+=1);a>5&&(e+=3+a-5)}for(var n=0;t-1>n;n+=1)for(var o=0;t-1>o;o+=1){var c=0;r.isDark(n,o)&&(c+=1),r.isDark(n+1,o)&&(c+=1),r.isDark(n,o+1)&&(c+=1),r.isDark(n+1,o+1)&&(c+=1),(0==c||4==c)&&(e+=3)}for(var n=0;t>n;n+=1)for(var o=0;t-6>o;o+=1)r.isDark(n,o)&&!r.isDark(n,o+1)&&r.isDark(n,o+2)&&r.isDark(n,o+3)&&r.isDark(n,o+4)&&!r.isDark(n,o+5)&&r.isDark(n,o+6)&&(e+=40);for(var o=0;t>o;o+=1)for(var n=0;t-6>n;n+=1)r.isDark(n,o)&&!r.isDark(n+1,o)&&r.isDark(n+2,o)&&r.isDark(n+3,o)&&r.isDark(n+4,o)&&!r.isDark(n+5,o)&&r.isDark(n+6,o)&&(e+=40);for(var l=0,o=0;t>o;o+=1)for(var n=0;t>n;n+=1)r.isDark(n,o)&&(l+=1);var g=Math.abs(100*l/t/t-50)/5;return e+=10*g},f}(),i=function(){for(var r=new Array(256),t=new Array(256),e=0;8>e;e+=1)r[e]=1<<e;for(var e=8;256>e;e+=1)r[e]=r[e-4]^r[e-5]^r[e-6]^r[e-8];for(var e=0;255>e;e+=1)t[r[e]]=e;var n={};return n.glog=function(r){if(1>r)throw new Error("glog("+r+")");return t[r]},n.gexp=function(t){for(;0>t;)t+=255;for(;t>=256;)t-=255;return r[t]},n}(),u=function(){var r=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12,7,37,13],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],t=function(r,t){var e={};return e.totalCount=r,e.dataCount=t,e},e={},o=function(t,e){switch(e){case n.L:return r[4*(t-1)+0];case n.M:return r[4*(t-1)+1];case n.Q:return r[4*(t-1)+2];case n.H:return r[4*(t-1)+3];default:return}};return e.getRSBlocks=function(r,e){var n=o(r,e);if("undefined"==typeof n)throw new Error("bad rs block @ typeNumber:"+r+"/errorCorrectLevel:"+e);for(var a=n.length/3,i=new Array,u=0;a>u;u+=1)for(var f=n[3*u+0],c=n[3*u+1],l=n[3*u+2],g=0;f>g;g+=1)i.push(t(c,l));return i},e}(),f=function(){var r=new Array,t=0,e={};return e.getBuffer=function(){return r},e.getAt=function(t){var e=Math.floor(t/8);return 1==(r[e]>>>7-t%8&1)},e.put=function(r,t){for(var n=0;t>n;n+=1)e.putBit(1==(r>>>t-n-1&1))},e.getLengthInBits=function(){return t},e.putBit=function(e){var n=Math.floor(t/8);r.length<=n&&r.push(0),e&&(r[n]|=128>>>t%8),t+=1},e},c=function(r){var n=e.MODE_8BIT_BYTE,o=t.stringToBytes(r),a={};return a.getMode=function(){return n},a.getLength=function(r){return o.length},a.write=function(r){for(var t=0;t<o.length;t+=1)r.put(o[t],8)},a},l=function(){var r=new Array,t={};return t.writeByte=function(t){r.push(255&t)},t.writeShort=function(r){t.writeByte(r),t.writeByte(r>>>8)},t.writeBytes=function(r,e,n){e=e||0,n=n||r.length;for(var o=0;n>o;o+=1)t.writeByte(r[o+e])},t.writeString=function(r){for(var e=0;e<r.length;e+=1)t.writeByte(r.charCodeAt(e))},t.toByteArray=function(){return r},t.toString=function(){var t="";t+="[";for(var e=0;e<r.length;e+=1)e>0&&(t+=","),t+=r[e];return t+="]"},t},g=function(){var r=0,t=0,e=0,n="",o={},a=function(r){n+=String.fromCharCode(i(63&r))},i=function(r){if(0>r);else{if(26>r)return 65+r;if(52>r)return 97+(r-26);if(62>r)return 48+(r-52);if(62==r)return 43;if(63==r)return 47}throw new Error("n:"+r)};return o.writeByte=function(n){for(r=r<<8|255&n,t+=8,e+=1;t>=6;)a(r>>>t-6),t-=6},o.flush=function(){if(t>0&&(a(r<<6-t),r=0,t=0),e%3!=0)for(var o=3-e%3,i=0;o>i;i+=1)n+="="},o.toString=function(){return n},o},s=function(r){var t=r,e=0,n=0,o=0,a={};a.read=function(){for(;8>o;){if(e>=t.length){if(0==o)return-1;throw new Error("unexpected end of file./"+o)}var r=t.charAt(e);if(e+=1,"="==r)return o=0,-1;r.match(/^\s$/)||(n=n<<6|i(r.charCodeAt(0)),o+=6)}var a=n>>>o-8&255;return o-=8,a};var i=function(r){if(r>=65&&90>=r)return r-65;if(r>=97&&122>=r)return r-97+26;if(r>=48&&57>=r)return r-48+52;if(43==r)return 62;if(47==r)return 63;throw new Error("c:"+r)};return a},v=function(r,t){var e=r,n=t,o=new Array(r*t),a={};a.setPixel=function(r,t,n){o[t*e+r]=n},a.write=function(r){r.writeString("GIF87a"),r.writeShort(e),r.writeShort(n),r.writeByte(128),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(255),r.writeByte(255),r.writeByte(255),r.writeString(","),r.writeShort(0),r.writeShort(0),r.writeShort(e),r.writeShort(n),r.writeByte(0);var t=2,o=u(t);r.writeByte(t);for(var a=0;o.length-a>255;)r.writeByte(255),r.writeBytes(o,a,255),a+=255;r.writeByte(o.length-a),r.writeBytes(o,a,o.length-a),r.writeByte(0),r.writeString(";")};var i=function(r){var t=r,e=0,n=0,o={};return o.write=function(r,o){if(r>>>o!=0)throw new Error("length over");for(;e+o>=8;)t.writeByte(255&(r<<e|n)),o-=8-e,r>>>=8-e,n=0,e=0;n=r<<e|n,e+=o},o.flush=function(){e>0&&t.writeByte(n)},o},u=function(r){for(var t=1<<r,e=(1<<r)+1,n=r+1,a=f(),u=0;t>u;u+=1)a.add(String.fromCharCode(u));a.add(String.fromCharCode(t)),a.add(String.fromCharCode(e));var c=l(),g=i(c);g.write(t,n);var s=0,v=String.fromCharCode(o[s]);for(s+=1;s<o.length;){var h=String.fromCharCode(o[s]);s+=1,a.contains(v+h)?v+=h:(g.write(a.indexOf(v),n),a.size()<4095&&(a.size()==1<<n&&(n+=1),a.add(v+h)),v=h)}return g.write(a.indexOf(v),n),g.write(e,n),g.flush(),c.toByteArray()},f=function(){var r={},t=0,e={};return e.add=function(n){if(e.contains(n))throw new Error("dup key:"+n);r[n]=t,t+=1},e.size=function(){return t},e.indexOf=function(t){return r[t]},e.contains=function(t){return"undefined"!=typeof r[t]},e};return a},h=function(r,t,e,n){for(var o=v(r,t),a=0;t>a;a+=1)for(var i=0;r>i;i+=1)o.setPixel(i,a,e(i,a));var u=l();o.write(u);for(var f=g(),c=u.toByteArray(),s=0;s<c.length;s+=1)f.writeByte(c[s]);f.flush();var h="";return h+="<img",h+=' src="',h+="data:image/gif;base64,",h+=f,h+='"',h+=' width="',h+=r,h+='"',h+=' height="',h+=t,h+='"',n&&(h+=' alt="',h+=n,h+='"'),h+="/>"};return t}();return function(r){"function"==typeof define&&define.amd?define([],r):"object"==typeof exports&&(module.exports=r())}(function(){return r}),!function(r){r.stringToBytes=function(r){function t(r){for(var t=[],e=0;e<r.length;e++){var n=r.charCodeAt(e);128>n?t.push(n):2048>n?t.push(192|n>>6,128|63&n):55296>n||n>=57344?t.push(224|n>>12,128|n>>6&63,128|63&n):(e++,n=65536+((1023&n)<<10|1023&r.charCodeAt(e)),t.push(240|n>>18,128|n>>12&63,128|n>>6&63,128|63&n))}return t}return t(r)}}(r),r}()); @@ -1170,20 +1170,20 @@ header:o[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:o[2].replace(/^ *|\ /** Trumbowyg v2.10.0 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */ jQuery.trumbowyg={langs:{en:{viewHTML:"View HTML",undo:"Undo",redo:"Redo",formatting:"Formatting",p:"Paragraph",blockquote:"Quote",code:"Code",header:"Header",bold:"Bold",italic:"Italic",strikethrough:"Stroke",underline:"Underline",strong:"Strong",em:"Emphasis",del:"Deleted",superscript:"Superscript",subscript:"Subscript",unorderedList:"Unordered list",orderedList:"Ordered list",insertImage:"Insert Image",link:"Link",createLink:"Insert link",unlink:"Remove link",justifyLeft:"Align Left",justifyCenter:"Align Center",justifyRight:"Align Right",justifyFull:"Align Justify",horizontalRule:"Insert horizontal rule",removeformat:"Remove format",fullscreen:"Fullscreen",close:"Close",submit:"Confirm",reset:"Cancel",required:"Required",description:"Description",title:"Title",text:"Text",target:"Target",width:"Width"}},plugins:{},svgPath:null,hideButtonTexts:null},Object.defineProperty(jQuery.trumbowyg,"defaultOptions",{value:{lang:"en",fixedBtnPane:!1,fixedFullWidth:!1,autogrow:!1,autogrowOnEnter:!1,imageWidthModalEdit:!1,prefix:"trumbowyg-",semantic:!0,resetCss:!1,removeformatPasted:!1,tagsToRemove:[],btns:[["viewHTML"],["undo","redo"],["formatting"],["strong","em","del"],["superscript","subscript"],["link"],["insertImage"],["justifyLeft","justifyCenter","justifyRight","justifyFull"],["unorderedList","orderedList"],["horizontalRule"],["removeformat"],["fullscreen"]],btnsDef:{},inlineElementsSelector:"a,abbr,acronym,b,caption,cite,code,col,dfn,dir,dt,dd,em,font,hr,i,kbd,li,q,span,strikeout,strong,sub,sup,u",pasteHandlers:[],plugins:{},urlProtocol:!1,minimalLinks:!1},writable:!1,enumerable:!0,configurable:!1}),function(e,t,n,a){"use strict";var o="tbwconfirm",r="tbwcancel";a.fn.trumbowyg=function(e,t){var n="trumbowyg";if(e===Object(e)||!e)return this.each(function(){a(this).data(n)||a(this).data(n,new i(this,e))});if(1===this.length)try{var o=a(this).data(n);switch(e){case"execCmd":return o.execCmd(t.cmd,t.param,t.forceCss);case"openModal":return o.openModal(t.title,t.content);case"closeModal":return o.closeModal();case"openModalInsert":return o.openModalInsert(t.title,t.fields,t.callback);case"saveRange":return o.saveRange();case"getRange":return o.range;case"getRangeText":return o.getRangeText();case"restoreRange":return o.restoreRange();case"enable":return o.setDisabled(!1);case"disable":return o.setDisabled(!0);case"toggle":return o.toggle();case"destroy":return o.destroy();case"empty":return o.empty();case"html":return o.html(t)}}catch(r){}return!1};var i=function(o,r){var i=this,s="trumbowyg-icons",l=a.trumbowyg;i.doc=o.ownerDocument||n,i.$ta=a(o),i.$c=a(o),r=r||{},null!=r.lang||null!=l.langs[r.lang]?i.lang=a.extend(!0,{},l.langs.en,l.langs[r.lang]):i.lang=l.langs.en,i.hideButtonTexts=null!=l.hideButtonTexts?l.hideButtonTexts:r.hideButtonTexts;var d=null!=l.svgPath?l.svgPath:r.svgPath;if(i.hasSvg=d!==!1,i.svgPath=i.doc.querySelector("base")?t.location.href.split("#")[0]:"",0===a("#"+s,i.doc).length&&d!==!1){if(null==d){for(var c=n.getElementsByTagName("script"),u=0;u<c.length;u+=1){var g=c[u].src,f=g.match("trumbowyg(.min)?.js");null!=f&&(d=g.substring(0,g.indexOf(f[0]))+"ui/icons.svg")}null==d&&console.warn("You must define svgPath: https://goo.gl/CfTY9U")}var h=i.doc.createElement("div");h.id=s,i.doc.body.insertBefore(h,i.doc.body.childNodes[0]),a.ajax({async:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",dataType:"xml",crossDomain:!0,url:d,data:null,beforeSend:null,complete:null,success:function(e){h.innerHTML=(new XMLSerializer).serializeToString(e.documentElement)}})}var p=i.lang.header,m=function(){return(t.chrome||t.Intl&&Intl.v8BreakIterator)&&"CSS"in t};i.btnsDef={viewHTML:{fn:"toggle"},undo:{isSupported:m,key:"Z"},redo:{isSupported:m,key:"Y"},p:{fn:"formatBlock"},blockquote:{fn:"formatBlock"},h1:{fn:"formatBlock",title:p+" 1"},h2:{fn:"formatBlock",title:p+" 2"},h3:{fn:"formatBlock",title:p+" 3"},h4:{fn:"formatBlock",title:p+" 4"},subscript:{tag:"sub"},superscript:{tag:"sup"},bold:{key:"B",tag:"b"},italic:{key:"I",tag:"i"},underline:{tag:"u"},strikethrough:{tag:"strike"},strong:{fn:"bold",key:"B"},em:{fn:"italic",key:"I"},del:{fn:"strikethrough"},createLink:{key:"K",tag:"a"},unlink:{},insertImage:{},justifyLeft:{tag:"left",forceCss:!0},justifyCenter:{tag:"center",forceCss:!0},justifyRight:{tag:"right",forceCss:!0},justifyFull:{tag:"justify",forceCss:!0},unorderedList:{fn:"insertUnorderedList",tag:"ul"},orderedList:{fn:"insertOrderedList",tag:"ol"},horizontalRule:{fn:"insertHorizontalRule"},removeformat:{},fullscreen:{"class":"trumbowyg-not-disable"},close:{fn:"destroy","class":"trumbowyg-not-disable"},formatting:{dropdown:["p","blockquote","h1","h2","h3","h4"],ico:"p"},link:{dropdown:["createLink","unlink"]}},i.o=a.extend(!0,{},l.defaultOptions,r),i.o.hasOwnProperty("imgDblClickHandler")||(i.o.imgDblClickHandler=i.getDefaultImgDblClickHandler()),i.urlPrefix=i.setupUrlPrefix(),i.disabled=i.o.disabled||"TEXTAREA"===o.nodeName&&o.disabled,r.btns?i.o.btns=r.btns:i.o.semantic||(i.o.btns[3]=["bold","italic","underline","strikethrough"]),a.each(i.o.btnsDef,function(e,t){i.addBtnDef(e,t)}),i.eventNamespace="trumbowyg-event",i.keys=[],i.tagToButton={},i.tagHandlers=[],i.pasteHandlers=[].concat(i.o.pasteHandlers),i.isIE=e.userAgent.indexOf("MSIE")!==-1||e.appVersion.indexOf("Trident/")!==-1,i.init()};i.prototype={DEFAULT_SEMANTIC_MAP:{b:"strong",i:"em",s:"del",strike:"del",div:"p"},init:function(){var e=this;e.height=e.$ta.height(),e.initPlugins();try{e.doc.execCommand("enableObjectResizing",!1,!1),e.doc.execCommand("defaultParagraphSeparator",!1,"p")}catch(t){}e.buildEditor(),e.buildBtnPane(),e.fixedBtnPaneEvents(),e.buildOverlay(),setTimeout(function(){e.disabled&&e.setDisabled(!0),e.$c.trigger("tbwinit")})},addBtnDef:function(e,t){this.btnsDef[e]=t},setupUrlPrefix:function(){var e=this.o.urlProtocol;if(e)return"string"!=typeof e?"https://":/:\/\/$/.test(e)?e:e+"://"},buildEditor:function(){var e=this,n=e.o.prefix,o="";e.$box=a("<div/>",{"class":n+"box "+n+"editor-visible "+n+e.o.lang+" trumbowyg"}),e.isTextarea=e.$ta.is("textarea"),e.isTextarea?(o=e.$ta.val(),e.$ed=a("<div/>"),e.$box.insertAfter(e.$ta).append(e.$ed,e.$ta)):(e.$ed=e.$ta,o=e.$ed.html(),e.$ta=a("<textarea/>",{name:e.$ta.attr("id"),height:e.height}).val(o),e.$box.insertAfter(e.$ed).append(e.$ta,e.$ed),e.syncCode()),e.$ta.addClass(n+"textarea").attr("tabindex",-1),e.$ed.addClass(n+"editor").attr({contenteditable:!0,dir:e.lang._dir||"ltr"}).html(o),e.o.tabindex&&e.$ed.attr("tabindex",e.o.tabindex),e.$c.is("[placeholder]")&&e.$ed.attr("placeholder",e.$c.attr("placeholder")),e.$c.is("[spellcheck]")&&e.$ed.attr("spellcheck",e.$c.attr("spellcheck")),e.o.resetCss&&e.$ed.addClass(n+"reset-css"),e.o.autogrow||e.$ta.add(e.$ed).css({height:e.height}),e.semanticCode(),e.o.autogrowOnEnter&&e.$ed.addClass(n+"autogrow-on-enter");var r,i=!1,s=!1,l="keyup";e.$ed.on("dblclick","img",e.o.imgDblClickHandler).on("keydown",function(t){if((t.ctrlKey||t.metaKey)&&!t.altKey){i=!0;var n=e.keys[String.fromCharCode(t.which).toUpperCase()];try{return e.execCmd(n.fn,n.param),!1}catch(a){}}}).on("compositionstart compositionupdate",function(){s=!0}).on(l+" compositionend",function(t){if("compositionend"===t.type)s=!1;else if(s)return;var n=t.which;if(!(n>=37&&n<=40)){if(!t.ctrlKey&&!t.metaKey||89!==n&&90!==n)if(i||17===n)"undefined"==typeof t.which&&e.semanticCode(!1,!1,!0);else{var a=!e.isIE||"compositionend"===t.type;e.semanticCode(!1,a&&13===n),e.$c.trigger("tbwchange")}else e.$c.trigger("tbwchange");setTimeout(function(){i=!1},50)}}).on("mouseup keydown keyup",function(t){(!t.ctrlKey&&!t.metaKey||t.altKey)&&setTimeout(function(){i=!1},50),clearTimeout(r),r=setTimeout(function(){e.updateButtonPaneStatus()},50)}).on("focus blur",function(t){if(e.$c.trigger("tbw"+t.type),"blur"===t.type&&a("."+n+"active-button",e.$btnPane).removeClass(n+"active-button "+n+"active"),e.o.autogrowOnEnter){if(e.autogrowOnEnterDontClose)return;"focus"===t.type?(e.autogrowOnEnterWasFocused=!0,e.autogrowEditorOnEnter()):e.o.autogrow||(e.$ed.css({height:e.$ed.css("min-height")}),e.$c.trigger("tbwresize"))}}).on("cut",function(){setTimeout(function(){e.semanticCode(!1,!0),e.$c.trigger("tbwchange")},0)}).on("paste",function(n){if(e.o.removeformatPasted){n.preventDefault(),t.getSelection&&t.getSelection().deleteFromDocument&&t.getSelection().deleteFromDocument();try{var o=t.clipboardData.getData("Text");try{e.doc.selection.createRange().pasteHTML(o)}catch(r){e.doc.getSelection().getRangeAt(0).insertNode(e.doc.createTextNode(o))}e.$c.trigger("tbwchange",n)}catch(i){e.execCmd("insertText",(n.originalEvent||n).clipboardData.getData("text/plain"))}}a.each(e.pasteHandlers,function(e,t){t(n)}),setTimeout(function(){e.semanticCode(!1,!0),e.$c.trigger("tbwpaste",n)},0)}),e.$ta.on("keyup",function(){e.$c.trigger("tbwchange")}).on("paste",function(){setTimeout(function(){e.$c.trigger("tbwchange")},0)}),e.$box.on("keydown",function(t){if(27===t.which&&1===a("."+n+"modal-box",e.$box).length)return e.closeModal(),!1})},autogrowEditorOnEnter:function(){var e=this;e.$ed.removeClass("autogrow-on-enter");var t=e.$ed[0].clientHeight;e.$ed.height("auto");var n=e.$ed[0].scrollHeight;e.$ed.addClass("autogrow-on-enter"),t!==n&&(e.$ed.height(t),setTimeout(function(){e.$ed.css({height:n}),e.$c.trigger("tbwresize")},0))},buildBtnPane:function(){var e=this,t=e.o.prefix,n=e.$btnPane=a("<div/>",{"class":t+"button-pane"});a.each(e.o.btns,function(o,r){a.isArray(r)||(r=[r]);var i=a("<div/>",{"class":t+"button-group "+(r.indexOf("fullscreen")>=0?t+"right":"")});a.each(r,function(t,n){try{e.isSupportedBtn(n)&&i.append(e.buildBtn(n))}catch(a){}}),i.html().trim().length>0&&n.append(i)}),e.$box.prepend(n)},buildBtn:function(e){var t=this,n=t.o.prefix,o=t.btnsDef[e],r=o.dropdown,i=null==o.hasIcon||o.hasIcon,s=t.lang[e]||e,l=a("<button/>",{type:"button","class":n+e+"-button "+(o["class"]||"")+(i?"":" "+n+"textual-button"),html:t.hasSvg&&i?'<svg><use xlink:href="'+t.svgPath+"#"+n+(o.ico||e).replace(/([A-Z]+)/g,"-$1").toLowerCase()+'"/></svg>':t.hideButtonTexts?"":o.text||o.title||t.lang[e]||e,title:(o.title||o.text||s)+(o.key?" (Ctrl + "+o.key+")":""),tabindex:-1,mousedown:function(){return r&&!a("."+e+"-"+n+"dropdown",t.$box).is(":hidden")||a("body",t.doc).trigger("mousedown"),!((t.$btnPane.hasClass(n+"disable")||t.$box.hasClass(n+"disabled"))&&!a(this).hasClass(n+"active")&&!a(this).hasClass(n+"not-disable"))&&(t.execCmd(!!r&&"dropdown"||o.fn||e,o.param||e,o.forceCss),!1)}});if(r){l.addClass(n+"open-dropdown");var d=n+"dropdown",c={"class":d+"-"+e+" "+d+" "+n+"fixed-top"};c["data-"+d]=e;var u=a("<div/>",c);a.each(r,function(e,n){t.btnsDef[n]&&t.isSupportedBtn(n)&&u.append(t.buildSubBtn(n))}),t.$box.append(u.hide())}else o.key&&(t.keys[o.key]={fn:o.fn||e,param:o.param||e});return r||(t.tagToButton[(o.tag||e).toLowerCase()]=e),l},buildSubBtn:function(e){var t=this,n=t.o.prefix,o=t.btnsDef[e],r=null==o.hasIcon||o.hasIcon;return o.key&&(t.keys[o.key]={fn:o.fn||e,param:o.param||e}),t.tagToButton[(o.tag||e).toLowerCase()]=e,a("<button/>",{type:"button","class":n+e+"-dropdown-button"+(o.ico?" "+n+o.ico+"-button":""),html:t.hasSvg&&r?'<svg><use xlink:href="'+t.svgPath+"#"+n+(o.ico||e).replace(/([A-Z]+)/g,"-$1").toLowerCase()+'"/></svg>'+(o.text||o.title||t.lang[e]||e):o.text||o.title||t.lang[e]||e,title:o.key?" (Ctrl + "+o.key+")":null,style:o.style||null,mousedown:function(){return a("body",t.doc).trigger("mousedown"),t.execCmd(o.fn||e,o.param||e,o.forceCss),!1}})},isSupportedBtn:function(e){try{return this.btnsDef[e].isSupported()}catch(t){}return!0},buildOverlay:function(){var e=this;return e.$overlay=a("<div/>",{"class":e.o.prefix+"overlay"}).appendTo(e.$box),e.$overlay},showOverlay:function(){var e=this;a(t).trigger("scroll"),e.$overlay.fadeIn(200),e.$box.addClass(e.o.prefix+"box-blur")},hideOverlay:function(){var e=this;e.$overlay.fadeOut(50),e.$box.removeClass(e.o.prefix+"box-blur")},fixedBtnPaneEvents:function(){var e=this,n=e.o.fixedFullWidth,o=e.$box;e.o.fixedBtnPane&&(e.isFixed=!1,a(t).on("scroll."+e.eventNamespace+" resize."+e.eventNamespace,function(){if(o){e.syncCode();var r=a(t).scrollTop(),i=o.offset().top+1,s=e.$btnPane,l=s.outerHeight()-2;r-i>0&&r-i-e.height<0?(e.isFixed||(e.isFixed=!0,s.css({position:"fixed",top:0,left:n?"0":"auto",zIndex:7}),a([e.$ta,e.$ed]).css({marginTop:s.height()})),s.css({width:n?"100%":o.width()-1+"px"}),a("."+e.o.prefix+"fixed-top",o).css({position:n?"fixed":"absolute",top:n?l:l+(r-i)+"px",zIndex:15})):e.isFixed&&(e.isFixed=!1,s.removeAttr("style"),a([e.$ta,e.$ed]).css({marginTop:0}),a("."+e.o.prefix+"fixed-top",o).css({position:"absolute",top:l}))}}))},setDisabled:function(e){var t=this,n=t.o.prefix;t.disabled=e,e?t.$ta.attr("disabled",!0):t.$ta.removeAttr("disabled"),t.$box.toggleClass(n+"disabled",e),t.$ed.attr("contenteditable",!e)},destroy:function(){var e=this,n=e.o.prefix;e.isTextarea?e.$box.after(e.$ta.css({height:""}).val(e.html()).removeClass(n+"textarea").show()):e.$box.after(e.$ed.css({height:""}).removeClass(n+"editor").removeAttr("contenteditable").removeAttr("dir").html(e.html()).show()),e.$ed.off("dblclick","img"),e.destroyPlugins(),e.$box.remove(),e.$c.removeData("trumbowyg"),a("body").removeClass(n+"body-fullscreen"),e.$c.trigger("tbwclose"),a(t).off("scroll."+e.eventNamespace+" resize."+e.eventNamespace)},empty:function(){this.$ta.val(""),this.syncCode(!0)},toggle:function(){var e=this,t=e.o.prefix;e.o.autogrowOnEnter&&(e.autogrowOnEnterDontClose=!e.$box.hasClass(t+"editor-hidden")),e.semanticCode(!1,!0),setTimeout(function(){e.doc.activeElement.blur(),e.$box.toggleClass(t+"editor-hidden "+t+"editor-visible"),e.$btnPane.toggleClass(t+"disable"),a("."+t+"viewHTML-button",e.$btnPane).toggleClass(t+"active"),e.$box.hasClass(t+"editor-visible")?e.$ta.attr("tabindex",-1):e.$ta.removeAttr("tabindex"),e.o.autogrowOnEnter&&!e.autogrowOnEnterDontClose&&e.autogrowEditorOnEnter()},0)},dropdown:function(e){var n=this,o=n.doc,r=n.o.prefix,i=a("[data-"+r+"dropdown="+e+"]",n.$box),s=a("."+r+e+"-button",n.$btnPane),l=i.is(":hidden");if(a("body",o).trigger("mousedown"),l){var d=s.offset().left;s.addClass(r+"active"),i.css({position:"absolute",top:s.offset().top-n.$btnPane.offset().top+s.outerHeight(),left:n.o.fixedFullWidth&&n.isFixed?d+"px":d-n.$btnPane.offset().left+"px"}).show(),a(t).trigger("scroll"),a("body",o).on("mousedown."+n.eventNamespace,function(e){i.is(e.target)||(a("."+r+"dropdown",n.$box).hide(),a("."+r+"active",n.$btnPane).removeClass(r+"active"),a("body",o).off("mousedown."+n.eventNamespace))})}},html:function(e){var t=this;return null!=e?(t.$ta.val(e),t.syncCode(!0),t.$c.trigger("tbwchange"),t):t.$ta.val()},syncTextarea:function(){var e=this;e.$ta.val(e.$ed.text().trim().length>0||e.$ed.find("hr,img,embed,iframe,input").length>0?e.$ed.html():"")},syncCode:function(e){var t=this;if(!e&&t.$ed.is(":visible"))t.syncTextarea();else{var n=a("<div>").html(t.$ta.val()),o=a("<div>").append(n);a(t.o.tagsToRemove.join(","),o).remove(),t.$ed.html(o.contents().html())}if(t.o.autogrow&&(t.height=t.$ed.height(),t.height!==t.$ta.css("height")&&(t.$ta.css({height:t.height}),t.$c.trigger("tbwresize"))),t.o.autogrowOnEnter){t.$ed.height("auto");var r=t.autogrowOnEnterWasFocused?t.$ed[0].scrollHeight:t.$ed.css("min-height");r!==t.$ta.css("height")&&(t.$ed.css({height:r}),t.$c.trigger("tbwresize"))}},semanticCode:function(e,t,n){var o=this;if(o.saveRange(),o.syncCode(e),o.o.semantic){if(o.semanticTag("b"),o.semanticTag("i"),o.semanticTag("s"),o.semanticTag("strike"),t){var r=o.o.inlineElementsSelector,i=":not("+r+")";o.$ed.contents().filter(function(){return 3===this.nodeType&&this.nodeValue.trim().length>0}).wrap("<span data-tbw/>");var s=function(e){if(0!==e.length){var t=e.nextUntil(i).addBack().wrapAll("<p/>").parent(),n=t.nextAll(r).first();t.next("br").remove(),s(n)}};s(o.$ed.children(r).first()),o.semanticTag("div",!0),o.$ed.find("p").filter(function(){return(!o.range||this!==o.range.startContainer)&&(0===a(this).text().trim().length&&0===a(this).children().not("br,span").length)}).contents().unwrap(),a("[data-tbw]",o.$ed).contents().unwrap(),o.$ed.find("p:empty").remove()}n||o.restoreRange(),o.syncTextarea()}},semanticTag:function(e,t){var n;if(null!=this.o.semantic&&"object"==typeof this.o.semantic&&this.o.semantic.hasOwnProperty(e))n=this.o.semantic[e];else{if(this.o.semantic!==!0||!this.DEFAULT_SEMANTIC_MAP.hasOwnProperty(e))return;n=this.DEFAULT_SEMANTIC_MAP[e]}a(e,this.$ed).each(function(){var e=a(this);e.wrap("<"+n+"/>"),t&&a.each(e.prop("attributes"),function(){e.parent().attr(this.name,this.value)}),e.contents().unwrap()})},createLink:function(){for(var e,t,n,o=this,r=o.doc.getSelection(),i=r.focusNode,s=(new XMLSerializer).serializeToString(r.getRangeAt(0).cloneContents());["A","DIV"].indexOf(i.nodeName)<0;)i=i.parentNode;if(i&&"A"===i.nodeName){var l=a(i);s=l.text(),e=l.attr("href"),o.o.minimalLinks||(t=l.attr("title"),n=l.attr("target"));var d=o.doc.createRange();d.selectNode(i),r.removeAllRanges(),r.addRange(d)}o.saveRange();var c={url:{label:"URL",required:!0,value:e},text:{label:o.lang.text,value:s}};o.o.minimalLinks||Object.assign(c,{title:{label:o.lang.title,value:t},target:{label:o.lang.target,value:n}}),o.openModalInsert(o.lang.createLink,c,function(e){var t=o.prependUrlPrefix(e.url);if(!t.length)return!1;var n=a(['<a href="',e.url,'">',e.text||e.url,"</a>"].join(""));return o.o.minimalLinks||(e.title.length>0&&n.attr("title",e.title),e.target.length>0&&n.attr("target",e.target)),o.range.deleteContents(),o.range.insertNode(n[0]),o.syncCode(),o.$c.trigger("tbwchange"),!0})},prependUrlPrefix:function(e){var t=this;if(!t.urlPrefix)return e;const n=/^([a-z][-+.a-z0-9]*:|\/|#)/i;if(n.test(e))return e;const a=/^[^\s@]+@[^\s@]+\.[^\s@]+$/;return a.test(e)?"mailto:"+e:t.urlPrefix+e},unlink:function(){var e=this,t=e.doc.getSelection(),n=t.focusNode;if(t.isCollapsed){for(;["A","DIV"].indexOf(n.nodeName)<0;)n=n.parentNode;if(n&&"A"===n.nodeName){var a=e.doc.createRange();a.selectNode(n),t.removeAllRanges(),t.addRange(a)}}e.execCmd("unlink",void 0,void 0,!0)},insertImage:function(){var e=this;e.saveRange();var t={url:{label:"URL",required:!0},alt:{label:e.lang.description,value:e.getRangeText()}};e.o.imageWidthModalEdit&&(t.width={}),e.openModalInsert(e.lang.insertImage,t,function(t){e.execCmd("insertImage",t.url);var n=a('img[src="'+t.url+'"]:not([alt])',e.$box);return n.attr("alt",t.alt),e.o.imageWidthModalEdit&&n.attr({width:t.width}),e.syncCode(),e.$c.trigger("tbwchange"),!0})},fullscreen:function(){var e,n=this,o=n.o.prefix,r=o+"fullscreen";n.$box.toggleClass(r),e=n.$box.hasClass(r),a("body").toggleClass(o+"body-fullscreen",e),a(t).trigger("scroll"),n.$c.trigger("tbw"+(e?"open":"close")+"fullscreen")},execCmd:function(e,t,n,a){var o=this;a=!!a||"","dropdown"!==e&&o.$ed.focus();try{o.doc.execCommand("styleWithCSS",!1,n||!1)}catch(r){}try{o[e+a](t)}catch(r){try{e(t)}catch(i){"insertHorizontalRule"===e?t=void 0:"formatBlock"===e&&o.isIE&&(t="<"+t+">"),o.doc.execCommand(e,!1,t),o.syncCode(),o.semanticCode(!1,!0)}"dropdown"!==e&&(o.updateButtonPaneStatus(),o.$c.trigger("tbwchange"))}},openModal:function(e,n){var i=this,s=i.o.prefix;if(a("."+s+"modal-box",i.$box).length>0)return!1;i.o.autogrowOnEnter&&(i.autogrowOnEnterDontClose=!0),i.saveRange(),i.showOverlay(),i.$btnPane.addClass(s+"disable");var l=a("<div/>",{"class":s+"modal "+s+"fixed-top"}).css({top:i.$btnPane.height()}).appendTo(i.$box);i.$overlay.one("click",function(){return l.trigger(r),!1});var d=a("<form/>",{action:"",html:n}).on("submit",function(){return l.trigger(o),!1}).on("reset",function(){return l.trigger(r),!1}).on("submit reset",function(){i.o.autogrowOnEnter&&(i.autogrowOnEnterDontClose=!1)}),c=a("<div/>",{"class":s+"modal-box",html:d}).css({top:"-"+i.$btnPane.outerHeight()+"px",opacity:0}).appendTo(l).animate({top:0,opacity:1},100);return a("<span/>",{text:e,"class":s+"modal-title"}).prependTo(c),l.height(c.outerHeight()+10),a("input:first",c).focus(),i.buildModalBtn("submit",c),i.buildModalBtn("reset",c),a(t).trigger("scroll"),l},buildModalBtn:function(e,t){var n=this,o=n.o.prefix;return a("<button/>",{"class":o+"modal-button "+o+"modal-"+e,type:e,text:n.lang[e]||e}).appendTo(a("form",t))},closeModal:function(){var e=this,t=e.o.prefix;e.$btnPane.removeClass(t+"disable"),e.$overlay.off();var n=a("."+t+"modal-box",e.$box);n.animate({top:"-"+n.height()},100,function(){n.parent().remove(),e.hideOverlay()}),e.restoreRange()},openModalInsert:function(e,t,n){var i=this,s=i.o.prefix,l=i.lang,d="";return a.each(t,function(e,t){var n=t.label||e,a=t.name||e,o=t.attributes||{},r=Object.keys(o).map(function(e){return e+'="'+o[e]+'"'}).join(" ");d+='<label><input type="'+(t.type||"text")+'" name="'+a+'"'+("checkbox"===t.type&&t.value?' checked="checked"':' value="'+(t.value||"").replace(/"/g,"""))+'"'+r+'><span class="'+s+'input-infos"><span>'+(l[n]?l[n]:n)+"</span></span></label>"}),i.openModal(e,d).on(o,function(){var e=a("form",a(this)),r=!0,s={};a.each(t,function(t,n){var o=n.name||t,l=a('input[name="'+o+'"]',e),d=l.attr("type");switch(d.toLowerCase()){case"checkbox":s[o]=l.is(":checked");break;case"radio":s[o]=l.filter(":checked").val();break;default:s[o]=a.trim(l.val())}n.required&&""===s[o]?(r=!1,i.addErrorOnModalField(l,i.lang.required)):n.pattern&&!n.pattern.test(s[o])&&(r=!1,i.addErrorOnModalField(l,n.patternError))}),r&&(i.restoreRange(),n(s,t)&&(i.syncCode(),i.$c.trigger("tbwchange"),i.closeModal(),a(this).off(o)))}).one(r,function(){a(this).off(o),i.closeModal()})},addErrorOnModalField:function(e,t){var n=this.o.prefix,o=e.parent();e.on("change keyup",function(){o.removeClass(n+"input-error")}),o.addClass(n+"input-error").find("input+span").append(a("<span/>",{"class":n+"msg-error",text:t}))},getDefaultImgDblClickHandler:function(){var e=this;return function(){var t=a(this),n=t.attr("src"),o="(Base64)";0===n.indexOf("data:image")&&(n=o);var r={url:{label:"URL",value:n,required:!0},alt:{label:e.lang.description,value:t.attr("alt")}};return e.o.imageWidthModalEdit&&(r.width={value:t.attr("width")?t.attr("width"):""}),e.openModalInsert(e.lang.insertImage,r,function(n){return n.src!==o&&t.attr({src:n.url}),t.attr({alt:n.alt}),e.o.imageWidthModalEdit&&(parseInt(n.width)>0?t.attr({width:n.width}):t.removeAttr("width")),!0}),!1}},saveRange:function(){var e=this,t=e.doc.getSelection();if(e.range=null,t.rangeCount){var n,a=e.range=t.getRangeAt(0),o=e.doc.createRange();o.selectNodeContents(e.$ed[0]),o.setEnd(a.startContainer,a.startOffset),n=(o+"").length,e.metaRange={start:n,end:n+(a+"").length}}},restoreRange:function(){var e,t=this,n=t.metaRange,a=t.range,o=t.doc.getSelection();if(a){if(n&&n.start!==n.end){var r,i=0,s=[t.$ed[0]],l=!1,d=!1;for(e=t.doc.createRange();!d&&(r=s.pop());)if(3===r.nodeType){var c=i+r.length;!l&&n.start>=i&&n.start<=c&&(e.setStart(r,n.start-i),l=!0),l&&n.end>=i&&n.end<=c&&(e.setEnd(r,n.end-i),d=!0),i=c}else for(var u=r.childNodes,g=u.length;g>0;)g-=1,s.push(u[g])}o.removeAllRanges(),o.addRange(e||a)}},getRangeText:function(){return this.range+""},updateButtonPaneStatus:function(){var e=this,t=e.o.prefix,n=e.getTagsRecursive(e.doc.getSelection().focusNode),o=t+"active-button "+t+"active";a("."+t+"active-button",e.$btnPane).removeClass(o),a.each(n,function(n,r){var i=e.tagToButton[r.toLowerCase()],s=a("."+t+i+"-button",e.$btnPane);if(s.length>0)s.addClass(o);else try{s=a("."+t+"dropdown ."+t+i+"-dropdown-button",e.$box);var l=s.parent().data("dropdown");a("."+t+l+"-button",e.$box).addClass(o)}catch(d){}})},getTagsRecursive:function(e,t){var n=this;if(t=t||(e&&e.tagName?[e.tagName]:[]),!e||!e.parentNode)return t;e=e.parentNode;var o=e.tagName;return"DIV"===o?t:("P"===o&&""!==e.style.textAlign&&t.push(e.style.textAlign),a.each(n.tagHandlers,function(a,o){t=t.concat(o(e,n))}),t.push(o),n.getTagsRecursive(e,t).filter(function(e){return null!=e}))},initPlugins:function(){var e=this;e.loadedPlugins=[],a.each(a.trumbowyg.plugins,function(t,n){n.shouldInit&&!n.shouldInit(e)||(n.init(e),n.tagHandler&&e.tagHandlers.push(n.tagHandler),e.loadedPlugins.push(n))})},destroyPlugins:function(){a.each(this.loadedPlugins,function(e,t){t.destroy&&t.destroy()})}}}(navigator,window,document,jQuery); ;window.Openrat={}; -;Openrat.View=function(e,t,i,r){this.action=e;this.method=t;this.id=i;this.params=r;this.before=function(){};this.start=function(e){this.before();this.element=e;this.loadView()};this.afterLoad=function(){};this.close=function(){};function n(e){Openrat.Workbench.afterViewLoadedHandler.fire(e);let f=$(e).data('afterViewLoaded');if(f instanceof Function)f(e)};this.loadView=function(){let url=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!1);let element=this.element;let view=this;let loadViewHtmlPromise=$.ajax(url);$(this.element).addClass('loader');loadViewHtmlPromise.done(function(e,t){if(!e)e='';$(element).html(e).removeClass('loader');$(element).find('form').each(function(){let form=new Openrat.Form();form.close=function(){view.close()};form.initOnElement(this)});n(element)});loadViewHtmlPromise.fail(function(e,t,i){$(element).html('');Openrat.Workbench.notify('','','error','Server Error',['Server Error while requesting url '+url,t])});let apiUrl=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!0);loadViewHtmlPromise.done(function(){})};Openrat.View.createUrl=function(e,subaction,i,extraid={},api=!1){let url='./';if(api)url+='api/';url+='?';if(e)url+='&action='+e;if(subaction)url+='&subaction='+subaction;if(i)url+='&id='+i;if(typeof extraid==='string'){extraid=extraid.replace(/'/g,'"');let extraObject=jQuery.parseJSON(extraid);jQuery.each(extraObject,function(e,t){url=url+'&'+e+'='+t})} +;Openrat.View=function(e,t,i,r){this.action=e;this.method=t;this.id=i;this.params=r;this.before=function(){};this.start=function(e){this.before();this.element=e;this.loadView()};this.afterLoad=function(){};this.close=function(){};function n(e){Openrat.Workbench.afterViewLoadedHandler.fire(e);let f=$(e).data('afterViewLoaded');if(f instanceof Function)f(e)};this.loadView=function(){let url=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!1);let element=this.element;let view=this;let loadViewHtmlPromise=$.ajax(url);$(this.element).addClass('loader');loadViewHtmlPromise.done(function(e,t){if(!e)e='';$(element).html(e).removeClass('loader');$(element).find('form').each(function(){let form=new Openrat.Form();form.close=function(){view.close()};form.initOnElement(this)});n(element)});loadViewHtmlPromise.fail(function(e,t,i){$(element).html('');Openrat.Workbench.notify('',0,'','error','Server Error',['Server Error while requesting url '+url,t])});let apiUrl=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!0);loadViewHtmlPromise.done(function(){})};Openrat.View.createUrl=function(e,subaction,i,extraid={},api=!1){let url='./';if(api)url+='api/';url+='?';if(e)url+='&action='+e;if(subaction)url+='&subaction='+subaction;if(i)url+='&id='+i;if(typeof extraid==='string'){extraid=extraid.replace(/'/g,'"');let extraObject=jQuery.parseJSON(extraid);jQuery.each(extraObject,function(e,t){url=url+'&'+e+'='+t})} else if(typeof extraid==='object'){jQuery.each(extraid,function(e,t){url=url+'&'+e+'='+t})} else{};return url}}; -;Openrat.Form=function(){const modes={showBrowserNotice:1,keepOpen:2,closeAfterSubmit:4,closeAfterSuccess:8,};this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit(modes.keepOpen)});$(this.element).find('select').change(function(){form.submit(modes.keepOpen)})};$(e).find('.or-form-btn--cancel').click(function(){form.cancel()});$(e).find('.or-form-btn--reset').click(function(){form.rollback()});$(e).find('.or-form-btn--apply').click(function(){form.submit(modes.keepOpen)});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,s,o){let view=new Openrat.View(e,t,s,o);view.start($(this.element).closest('.view'))};this.submit=function(e){if(e===undefined)if($(this.element).data('async'))e=modes.closeAfterSubmit;else e=modes.closeAfterSuccess;let status=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(status);$(status).show();$(this.element).find('.error').removeClass('error');let params=$(this.element).serializeArray();let data={};$(params).each(function(e,t){data[t.name]=t.value});if(!data.id)data.id=Openrat.Workbench.state.id;if(!data.action)data.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(data.action,data.subaction,data.id,data);$(status).remove()} +;Openrat.Form=function(){const modes={showBrowserNotice:1,keepOpen:2,closeAfterSubmit:4,closeAfterSuccess:8,};this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit(modes.keepOpen)});$(this.element).find('select').change(function(){form.submit(modes.keepOpen)})};$(e).find('.or-form-btn--cancel').click(function(){form.cancel()});$(e).find('.or-form-btn--reset').click(function(){form.rollback()});$(e).find('.or-form-btn--apply').click(function(){form.submit(modes.keepOpen)});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,s,o){let view=new Openrat.View(e,t,s,o);view.start($(this.element).closest('.view'))};this.submit=function(e){if(e===undefined)if($(this.element).data('async'))e=modes.closeAfterSubmit;else e=modes.closeAfterSuccess;let status=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(status);$(status).show();$(this.element).find('.or-input.error').removeClass('error');let params=$(this.element).serializeArray();let data={};$(params).each(function(e,t){data[t.name]=t.value});if(!data.id)data.id=Openrat.Workbench.state.id;if(!data.action)data.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(data.action,data.subaction,data.id,data);$(status).remove()} else{let url='./api/';this.setLoadStatus(!0);url+='';data.output='json';if(e==modes.closeAfterSubmit)this.close();let form=this;$.ajax({'type':'POST',url:url,data:data,success:function(t,s,o){form.setLoadStatus(!1);$(status).remove();form.doResponse(t,s,form.element,function(){if(e==modes.closeAfterSuccess){form.close();$(form.element).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty')};let afterSuccess=$(form.element).data('afterSuccess');let async=$(form.element).data('async');if(afterSuccess){if(afterSuccess=='reloadAll'){Openrat.Workbench.reloadAll()}} -else{if(async);else Openrat.Workbench.reloadViews()}})},error:function(e,t,s){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('','','error',error.error,[error.description])}catch(o){let msg=e.responseText;Openrat.Workbench.notify('','','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,s,onSuccess=$.noop){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(s).data('async');Openrat.Workbench.notify(e.type,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){onSuccess();Openrat.Workbench.dataChangedHandler.fire()} -else{}});$.each(e['errors'],function(e,t){$('input[name='+t+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open')});if(e.control.redirect)window.location.href=e.control.redirect}}; +else{if(async);else Openrat.Workbench.reloadViews()}})},error:function(e,t,s){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('',0,'','error',error.error,[error.description])}catch(o){let msg=e.responseText;Openrat.Workbench.notify('',0,'','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,s,onSuccess=$.noop){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(s).data('async');Openrat.Workbench.notify(e.type,e.id,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){onSuccess();Openrat.Workbench.dataChangedHandler.fire()} +else{}});$.each(e['errors'],function(e,t){$('.or-input[name='+t+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open')})}}; ;Openrat.Workbench=new function(){'use strict';this.state={};this.popupWindow=null;this.initialize=function(){this.initializePingTimer();this.initializeDirtyWarning();this.initializeState();this.openModalDialog()};this.initializeDirtyWarning=function(){window.addEventListener('beforeunload',function(t){if($('.view.dirty').length>0){t.preventDefault();return'Unsaved content will be lost.'} else{return undefined}})};this.openModalDialog=function(){if($('#dialog').data('action')){this.startDialog('',$('#dialog').data('action'),$('#dialog').data('action'),0,{})}};this.initializeState=function(){let parts=window.location.hash.split('/');let state={action:'index',id:0};if(parts.length>=2)state.action=parts[1].toLowerCase();if(parts.length>=3)state.id=parts[2].replace(/[^0-9_]/gim,'');Openrat.Workbench.state=state;$('#editor').attr('data-action',state.action);$('#editor').attr('data-id',state.id);$('#editor').attr('data-extra','{}');Openrat.Navigator.toActualHistory(state)};this.initializePingTimer=function(){let ping=function(){let pingPromise=$.getJSON(Openrat.View.createUrl('profile','ping',0,{},!0));pingPromise.fail(function(){console.warn('The server ping has failed.');if($('.view.dirty').length>0){window.alert('The server session is lost, please save your data.')} else{}})};let timeoutMinutes=5;window.setInterval(ping,timeoutMinutes*60*1000)};this.loadNewActionState=function(t){Openrat.Workbench.state=t;Openrat.Workbench.loadNewAction(t.action,t.id,t.data);this.afterNewActionHandler.fire()};this.afterNewActionHandler=$.Callbacks();this.loadNewAction=function(t,e,i){$('#editor').attr('data-action',t);$('#editor').attr('data-id',e);$('#editor').attr('data-extra',JSON.stringify(i));this.reloadViews()};this.reloadViews=function(){$('#workbench section.closed .view-loader').empty();Openrat.Workbench.loadViews($('#workbench section.open .view-loader'))};this.reloadAll=function(){Openrat.Workbench.loadViews($('.view-loader,.view-static').empty());this.loadUserStyle();this.loadLanguage();this.loadUISettings();this.loadNavigationTree()};this.loadUserStyle=function(){let url=Openrat.View.createUrl('profile','userinfo',0,{},!0);$.getJSON(url,function(t){let style=t.output['style'];Openrat.Workbench.setUserStyle(style);let color=t.output['theme-color'];Openrat.Workbench.setThemeColor(color)})};this.loadNavigationTree=function(){let loadBranchUrl='./?action=tree&subaction=branch&id=0&type=root';$.get(loadBranchUrl).done(function(t){let $ul=$('<ul class="or-navtree-list" />');$ul.appendTo($('.or-navtree').empty()).append(t);$ul.find('li').orTree();$ul.find('.clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})};this.settings={};this.language={};this.loadLanguage=function(){let url=Openrat.View.createUrl('profile','language',0,{},!0);$.getJSON(url,function(t){Openrat.Workbench.language=t.output.language})};this.loadUISettings=function(){let url=Openrat.View.createUrl('profile','uisettings',0,{},!0);$.getJSON(url,function(t){Openrat.Workbench.settings=t.output.settings.settings})};this.loadViews=function(t){t.each(function(t){let $targetDOMElement=$(this);Openrat.Workbench.loadNewActionIntoElement($targetDOMElement)})};this.loadNewActionIntoElement=function(t){let action;if(t.is('.view-static'))action=t.attr('data-action');else action=$('#editor').attr('data-action');let id=$('#editor').attr('data-id');let params=$('#editor').attr('data-extra');let method=t.data('method');let view=new Openrat.View(action,method,id,params);view.start(t)};this.setUserStyle=function(t){var e=$('html'),i=e.attr('class').split(/\s+/);$.each(i,function(t,i){if(i.startsWith('theme-')){e.removeClass(i)}});e.addClass('theme-'+t.toLowerCase())};this.setThemeColor=function(t){$('#theme-color').attr('content',t)};let notifyBrowser=function(t){if(!('Notification' in window)){return} else if(Notification.permission==='granted'){let notification=new Notification(t)} -else if(Notification.permission!=='denied'){Notification.requestPermission(function(e){if(e==='granted'){let notification=new Notification(t)}})}};this.notify=function(e,a,i,o,log=[],notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(o);let notice=$('<div class="notice '+i+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log.length)$(toolbar).append('<i class="or-action-full image-icon image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>');$(notice).append(toolbar);let id=0;if(a)$(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+e+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+e+'"></i> '+a+'</a></div>');$(notice).append('<div class="text">'+t(o)+'</div>');if(log.length){let logLi=log.reduce((result,item)=>{result+='<li><pre>'+t(item)+'</pre></li>';return result},'');$(notice).append('<div class="log"><ul>'+logLi+'</ul></div>')};$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-action-full').click(function(){$(notice).toggleClass('full')});$(notice).find('.or-action-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(i=='ok')timeout=20;if(i=='info')timeout=60;if(i=='warning')timeout=120;if(i=='error')timeout=120;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.dataChangedHandler=$.Callbacks();this.dataChangedHandler.add(function(){if(Openrat.Workbench.popupWindow)Openrat.Workbench.popupWindow.location.reload()});this.afterViewLoadedHandler=$.Callbacks();let afterViewFunctions=[];this.registerAfterViewLoaded=function(t){afterViewFunctions.push(t)};this.afterViewLoaded=function(t){afterViewFunctions.forEach(function(e){e(t)})};this.setApplicationTitle=function(t){if(t)$('head > title').text(t+' - '+$('head > title').data('default'));else $('head > title').text($('head > title').data('default'))};var t=function(t){return String(t).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"')};this.registerOpenClose=function(t){$(t).children('.on-click-open-close').click(function(){$(this).closest('.toggle-open-close').toggleClass('open closed')})};this.openNewAction=function(t,e,i){$('nav').removeClass('open');Openrat.Workbench.setApplicationTitle(t);Openrat.Navigator.navigateToNew({'action':e,'id':i})};this.startDialog=function(t,e,i,a,o){if(!e)e=$('#editor').attr('data-action');if(!a)a=$('#editor').attr('data-id');let view=new Openrat.View(e,i,a,o);view.before=function(){$('#dialog > .view').html('<div class="header"><img class="icon" title="" src="./themes/default/images/icon/'+i+'.png" />'+t+'</div>');$('#dialog > .view').data('id',a);$('#dialog').removeClass('is-closed').addClass('is-open');let view=this;this.escapeKeyClosingHandler=function(t){if(t.keyCode==27){view.close();$(document).off('keyup')}};$(document).keyup(this.escapeKeyClosingHandler);$('#dialog .filler').click(function(){view.close()})};view.close=function(){if($('div#dialog').hasClass('modal'))return;$('#dialog .view').removeClass('dirty');$('#dialog .view').html('');$('#dialog').removeClass('is-open').addClass('is-closed');$(document).unbind('keyup',this.escapeKeyClosingHandler)};view.start($('div#dialog > .view'))};this.registerDraggable=function(t){$(t).find('.or-draggable').draggable({helper:'clone',opacity:0.7,zIndex:2,distance:10,cursor:'move',revert:'false'})};this.registerDroppable=function(t){$(t).find('.or-droppable').droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(t,e){let dropped=e.draggable;let id=dropped.data('id');let name=dropped.data('name');if(!name)name=id;$(this).find('.or-selector-link-value').val(id);$(this).find('.or-selector-link-name').val(name).attr('placeholder',name)}})}}; +else if(Notification.permission!=='denied'){Notification.requestPermission(function(e){if(e==='granted'){let notification=new Notification(t)}})}};this.notify=function(e,i,o,a,n,log=[],notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(n);let notice=$('<div class="notice '+a+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log.length)$(toolbar).append('<i class="or-action-full image-icon image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>');$(notice).append(toolbar);if(o)$(notice).append('<div class="name clickable"><a href="'+Openrat.Navigator.createShortUrl(e,i)+'" data-type="open" data-action="'+e+'" data-id="'+i+'"><i class="or-action-full image-icon image-icon--action-'+e+'"></i> '+o+'</a></div>');$(notice).append('<div class="text">'+t(n)+'</div>');if(log.length){let logLi=log.reduce((result,item)=>{result+='<li><pre>'+t(item)+'</pre></li>';return result},'');$(notice).append('<div class="log"><ul>'+logLi+'</ul></div>')};$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-action-full').click(function(){$(notice).toggleClass('full')});$(notice).find('.or-action-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(a=='ok')timeout=20;if(a=='info')timeout=60;if(a=='warning')timeout=120;if(a=='error')timeout=120;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.dataChangedHandler=$.Callbacks();this.dataChangedHandler.add(function(){if(Openrat.Workbench.popupWindow)Openrat.Workbench.popupWindow.location.reload()});this.afterViewLoadedHandler=$.Callbacks();let afterViewFunctions=[];this.registerAfterViewLoaded=function(t){afterViewFunctions.push(t)};this.afterViewLoaded=function(t){afterViewFunctions.forEach(function(e){e(t)})};this.setApplicationTitle=function(t){if(t)$('head > title').text(t+' - '+$('head > title').data('default'));else $('head > title').text($('head > title').data('default'))};var t=function(t){return String(t).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"')};this.registerOpenClose=function(t){$(t).children('.on-click-open-close').click(function(){$(this).closest('.toggle-open-close').toggleClass('open closed')})};this.openNewAction=function(t,e,i){$('nav').removeClass('open');Openrat.Workbench.setApplicationTitle(t);Openrat.Navigator.navigateToNew({'action':e,'id':i})};this.startDialog=function(t,e,i,a,o){if(!e)e=$('#editor').attr('data-action');if(!a)a=$('#editor').attr('data-id');let view=new Openrat.View(e,i,a,o);view.before=function(){$('#dialog > .view').html('<div class="header"><img class="icon" title="" src="./themes/default/images/icon/'+i+'.png" />'+t+'</div>');$('#dialog > .view').data('id',a);$('#dialog').removeClass('is-closed').addClass('is-open');let view=this;this.escapeKeyClosingHandler=function(t){if(t.keyCode==27){view.close();$(document).off('keyup')}};$(document).keyup(this.escapeKeyClosingHandler);$('#dialog .filler').click(function(){view.close()})};view.close=function(){if($('div#dialog').hasClass('modal'))return;$('#dialog .view').removeClass('dirty');$('#dialog .view').html('');$('#dialog').removeClass('is-open').addClass('is-closed');$(document).unbind('keyup',this.escapeKeyClosingHandler)};view.start($('div#dialog > .view'))};this.registerDraggable=function(t){$(t).find('.or-draggable').draggable({helper:'clone',opacity:0.7,zIndex:2,distance:10,cursor:'move',revert:'false'})};this.registerDroppable=function(t){$(t).find('.or-droppable').droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(t,e){let dropped=e.draggable;let id=dropped.data('id');let name=dropped.data('name');if(!name)name=id;$(this).find('.or-selector-link-value').val(id);$(this).find('.or-selector-link-name').val(name).attr('placeholder',name)}})}}; ;Openrat.Navigator=new function(){'use strict';this.navigateTo=function(t){Openrat.Workbench.loadNewActionState(t)};this.navigateToNew=function(t){this.navigateTo(t);window.history.pushState(t,t.name,this.createShortUrl(t.action,t.id))};this.toActualHistory=function(t){window.history.replaceState(t,t.name,this.createShortUrl(t.action,t.id))};this.createShortUrl=function(t,i){return'./#/'+t+(i?'/'+i:'')}}; -;$(function(){$('html').removeClass('nojs');$('.initial-hidden').removeClass('initial-hidden');function e(){function e(e){$(e).closest('div.panel').fadeOut('fast',function(){$(this).toggleClass('fullscreen').fadeIn('fast')})};$('div.header').dblclick(function(){e(this)})};e();window.onpopstate=function(e){Openrat.Navigator.navigateTo(e.state)};Openrat.Workbench.initialize();Openrat.Workbench.reloadAll();let registerWorkbenchGlobalEvents=function(){$('.keystroke').each(function(){let keystrokeElement=$(this);let keystroke=keystrokeElement.text();if(keystroke.length==0)return;let keyaction=function(){keystrokeElement.click()};$(document).bind('keydown',keystroke,keyaction)});$('section.toggle-open-close .on-click-open-close').click(function(){var n=$(this).closest('section');if(n.hasClass('disabled'))return;var e=n.find('div.view-loader');if(e.children().length==0)Openrat.Workbench.loadNewActionIntoElement(e)})};$('.or-initial-notice').each(function(){Openrat.Workbench.notify('','','info',$(this).text());$(this).remove()});registerWorkbenchGlobalEvents();let closeMenu=function(){$('body').click(function(){$('.toolbar-icon.menu').parents('.or-menu').removeClass('open')})};closeMenu();Openrat.Workbench.afterNewActionHandler.add(function(){let url=Openrat.View.createUrl('tree','path',Openrat.Workbench.state.id,{'type':Openrat.Workbench.state.action});let loadPromise=$.get(url);loadPromise.done(function(e){$('.or-breadcrumb').empty().append(e).find('.clickable').orLinkify();$('nav .or-navtree-node').removeClass('or-navtree-node--selected');$('.or-breadcrumb a').each(function(){let action=$(this).data('action');let id=$(this).data('id');let $navControl=$('nav .or-navtree-node[data-type='+action+'][data-id='+id+'].or-navtree-node--is-closed .or-navtree-node-control');$navControl.click()})}).fail(function(e){console.warn(e);console.warn('failed to load path from '+url)}).always(function(){})})});let filterMenus=function(){let action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;$('div.clickable').addClass('active');$('div.clickable.filtered').removeClass('active').addClass('inactive');$('div.clickable.filtered.on-action-'+action).addClass('active').removeClass('inactive');$('div.clickable.filtered a').attr('data-id',id)};$('#title.view').data('afterViewLoaded',function(){filterMenus()});Openrat.Workbench.afterNewActionHandler.add(function(){filterMenus()});Openrat.Workbench.afterViewLoadedHandler.add(function(e){if(Openrat.Workbench.popupWindow)$(e).find('a[data-type=\'popup\']').each(function(){Openrat.Workbench.popupWindow.location.href=$(this).attr('data-url')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var n=$(e).closest('section');n.toggleClass('is-empty',$(e).is(':empty'));if(!$(e).is(':empty'))n.slideDown('fast');else n.slideUp('fast');$(e).closest('div.panel').find('div.header div.dropdown div.entry.perview').remove();$(e).find('.toggle-nav-open-close').click(function(){$('nav').toggleClass('open')});$(e).find('.toggle-nav-small').click(function(){$('nav').toggleClass('small')});$(e).find('div.headermenu > a').each(function(e,n){});$(e).find('div.header > a.back').each(function(n,t){$(t).removeClass('button').wrap('<div class="entry perview" />').parent().appendTo($(e).closest('div.panel').find('div.header div.dropdown').first())});$(e).find('div.selector.tree').each(function(){var e=this;$(this).orTree({type:'project',selectable:$(e).attr('data-types').split(','),id:$(e).attr('data-init-folderid'),onSelect:function(n,t,i){var o=$(e).parent();$(o).find('input[type=text]').attr('value',n);$(o).find('input[type=hidden]').attr('value',i)}})});t(e);$(e).find('input,select,textarea').change(function(){$(this).closest('.view').addClass('dirty')});$(e).find('.or-theme-chooser').change(function(){Openrat.Workbench.setUserStyle(this.value)});function o(e){$(e).find('.toolbar-icon.menu').click(function(e){e.stopPropagation();$(this).parents('.or-menu').toggleClass('open')});$(e).find('.toolbar-icon.menu').mouseover(function(){$(this).parents('.or-menu').find('.toolbar-icon.menu').removeClass('open');$(this).addClass('open')})};function i(e){$(e).find('.search input').orSearch({dropdown:'#title div.search div.dropdown',select:function(e){Openrat.Workbench.openNewAction(e.name,e.action,e.id)}})};function a(e){$(e).find('.selector input').orSearch({dropdown:'.dropdown',select:function(n){$(e).find('.or-selector-link-value').val(n.id);$(e).find('.or-selector-link-name').val(n.name).attr('placeholder',n.name)}})};function r(e){$(e).find('.or-navtree-node').orTree()};o(e);i(e);a(e);r(e);function t(e){Openrat.Workbench.registerDraggable(e);Openrat.Workbench.registerDroppable(e)};t(e)}); +;$(function(){$('html').removeClass('nojs');$('.initial-hidden').removeClass('initial-hidden');function e(){function e(e){$(e).closest('div.panel').fadeOut('fast',function(){$(this).toggleClass('fullscreen').fadeIn('fast')})};$('div.header').dblclick(function(){e(this)})};e();window.onpopstate=function(e){Openrat.Navigator.navigateTo(e.state)};Openrat.Workbench.initialize();Openrat.Workbench.reloadAll();let registerWorkbenchGlobalEvents=function(){$('.keystroke').each(function(){let keystrokeElement=$(this);let keystroke=keystrokeElement.text();if(keystroke.length==0)return;let keyaction=function(){keystrokeElement.click()};$(document).bind('keydown',keystroke,keyaction)});$('section.toggle-open-close .on-click-open-close').click(function(){var n=$(this).closest('section');if(n.hasClass('disabled'))return;var e=n.find('div.view-loader');if(e.children().length==0)Openrat.Workbench.loadNewActionIntoElement(e)})};$('.or-initial-notice').each(function(){Openrat.Workbench.notify('',0,'','info',$(this).text());$(this).remove()});registerWorkbenchGlobalEvents();let closeMenu=function(){$('body').click(function(){$('.toolbar-icon.menu').parents('.or-menu').removeClass('open')})};closeMenu();Openrat.Workbench.afterNewActionHandler.add(function(){let url=Openrat.View.createUrl('tree','path',Openrat.Workbench.state.id,{'type':Openrat.Workbench.state.action});let loadPromise=$.get(url);loadPromise.done(function(e){$('.or-breadcrumb').empty().append(e).find('.clickable').orLinkify();$('nav .or-navtree-node').removeClass('or-navtree-node--selected');$('.or-breadcrumb a').each(function(){let action=$(this).data('action');let id=$(this).data('id');let $navControl=$('nav .or-navtree-node[data-type='+action+'][data-id='+id+'].or-navtree-node--is-closed .or-navtree-node-control');$navControl.click()})}).fail(function(e){console.warn(e);console.warn('failed to load path from '+url)}).always(function(){})})});let filterMenus=function(){let action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;$('div.clickable').addClass('active');$('div.clickable.filtered').removeClass('active').addClass('inactive');$('div.clickable.filtered.on-action-'+action).addClass('active').removeClass('inactive');$('div.clickable.filtered a').attr('data-id',id)};$('#title.view').data('afterViewLoaded',function(){filterMenus()});Openrat.Workbench.afterNewActionHandler.add(function(){filterMenus()});Openrat.Workbench.afterViewLoadedHandler.add(function(e){if(Openrat.Workbench.popupWindow)$(e).find('a[data-type=\'popup\']').each(function(){Openrat.Workbench.popupWindow.location.href=$(this).attr('data-url')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var n=$(e).closest('section');n.toggleClass('is-empty',$(e).is(':empty'));if(!$(e).is(':empty'))n.slideDown('fast');else n.slideUp('fast');$(e).closest('div.panel').find('div.header div.dropdown div.entry.perview').remove();$(e).find('.toggle-nav-open-close').click(function(){$('nav').toggleClass('open')});$(e).find('.toggle-nav-small').click(function(){$('nav').toggleClass('small')});$(e).find('div.headermenu > a').each(function(e,n){});$(e).find('div.header > a.back').each(function(n,t){$(t).removeClass('button').wrap('<div class="entry perview" />').parent().appendTo($(e).closest('div.panel').find('div.header div.dropdown').first())});$(e).find('div.selector.tree').each(function(){var e=this;$(this).orTree({type:'project',selectable:$(e).attr('data-types').split(','),id:$(e).attr('data-init-folderid'),onSelect:function(n,t,i){var o=$(e).parent();$(o).find('input[type=text]').attr('value',n);$(o).find('input[type=hidden]').attr('value',i)}})});t(e);$(e).find('input,select,textarea').change(function(){$(this).closest('.view').addClass('dirty')});$(e).find('.or-theme-chooser').change(function(){Openrat.Workbench.setUserStyle(this.value)});function o(e){$(e).find('.toolbar-icon.menu').click(function(e){e.stopPropagation();$(this).parents('.or-menu').toggleClass('open')});$(e).find('.toolbar-icon.menu').mouseover(function(){$(this).parents('.or-menu').find('.toolbar-icon.menu').removeClass('open');$(this).addClass('open')})};function i(e){$(e).find('.search input').orSearch({dropdown:'#title div.search div.dropdown',select:function(e){Openrat.Workbench.openNewAction(e.name,e.action,e.id)}})};function a(e){$(e).find('.selector input').orSearch({dropdown:'.dropdown',select:function(n){$(e).find('.or-selector-link-value').val(n.id);$(e).find('.or-selector-link-name').val(n.name).attr('placeholder',n.name)}})};function r(e){$(e).find('.or-navtree-node').orTree()};o(e);i(e);a(e);r(e);function t(e){Openrat.Workbench.registerDraggable(e);Openrat.Workbench.registerDroppable(e)};t(e)}); ;Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('textarea').orAutoheight();$(e).find('textarea.editor.code-editor').each(function(){let mode=$(this).data('mode');let mimetype=$(this).data('mimetype');if(mimetype.length>0)mode=mimetype;let textareaEl=this;let editor=CodeMirror.fromTextArea(textareaEl,{lineNumbers:!0,viewportMargin:Infinity,mode:mode});editor.on('change',function(){let newValue=editor.getValue();$(textareaEl).val(newValue)});$(editor.getWrapperElement()).droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let pos=editor.getCursor();editor.setSelection(pos,pos);let insertText=dropped.data('id');let toInsert=''+insertText;editor.replaceSelection(toInsert)}})});$(e).find('textarea.editor.markdown-editor').each(function(){let textarea=this;let toolbar=[{name:'bold',action:SimpleMDE.toggleBold,className:'image-icon image-icon--editor-bold',title:'Bold',},{name:'italic',action:SimpleMDE.toggleItalic,className:'image-icon image-icon--editor-italic',title:'Italic',},{name:'heading',action:SimpleMDE.toggleHeadingBigger,className:'image-icon image-icon--editor-headline',title:'Headline',},'|',{name:'quote',action:SimpleMDE.toggleBlockquote,className:'image-icon image-icon--editor-quote',title:'Quote',},{name:'code',action:SimpleMDE.toggleCodeBlock,className:'image-icon image-icon--editor-code',title:'Code',},'|',{name:'generic list',action:SimpleMDE.toggleUnorderedList,className:'image-icon image-icon--editor-unnumberedlist',title:'Unnumbered list',},{name:'numbered list',action:SimpleMDE.toggleOrderedList,className:'image-icon image-icon--editor-numberedlist',title:'Numbered list',},'|',{name:'table',action:SimpleMDE.drawTable,className:'image-icon image-icon--editor-table',title:'Table',},{name:'horizontalrule',action:SimpleMDE.drawHorizontalRule,className:'image-icon image-icon--editor-horizontalrule',title:'Horizontal rule',},'|',{name:'undo',action:SimpleMDE.undo,className:'image-icon image-icon--editor-undo',title:'Undo',},{name:'redo',action:SimpleMDE.redo,className:'image-icon image-icon--editor-redo',title:'Redo',},'|',{name:'link',action:SimpleMDE.drawLink,className:'image-icon image-icon--editor-link',title:'Link',},{name:'image',action:SimpleMDE.drawImage,className:'image-icon image-icon--editor-image',title:'Image',},'|',{name:'guide',action:'https://simplemde.com/markdown-guide',className:'image-icon image-icon--editor-help',title:'Howto markdown',},];let mde=new SimpleMDE({element:$(this)[0],toolbar:toolbar,autoDownloadFontAwesome:!1});let codemirror=mde.codemirror;$(codemirror.getWrapperElement()).droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let insertText='';let id=dropped.data('id');let url='__OID__'+id+'__';if(dropped.data('type')=='image')insertText='';else insertText='['+id+']('+url+')';let pos=codemirror.getCursor();codemirror.setSelection(pos,pos);codemirror.replaceSelection(insertText)}});codemirror.on('change',function(){let newValue=codemirror.getValue();$(textarea).val(newValue)})});$(e).find('textarea.editor.html-editor').each(function(){let textarea=this;$.trumbowyg.svgPath='./modules/editor/trumbowyg/ui/icons.svg';$(textarea).trumbowyg();$(textarea).closest('form').find('.trumbowyg-editor').droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let id=dropped.data('id');let url='./?_='+dropped.data('type')+'-'+id+'&subaction=show&embed=1&__OID__'+id+'__='+id;let insertText='';if(dropped.data('type')=='image')insertText='<img src="'+url+'" alt="" />';else insertText='<a href="'+url+'" />'+id+'</a>';$(textarea).trumbowyg('execCmd',{cmd:'insertHTML',param:insertText,forceCss:!1,})}})})}); ;Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('.clickable').orLinkify()}); ;Openrat.Workbench.afterViewLoadedHandler.add(function(r){$(r).find('.or-qrcode').mouseover(function(){let r=this;if($(r).children().length>0)return;let wrapper=$('<div class="or-info-popup"></div>');$(r).append(wrapper);var e=$(r).attr('data-qrcode');$(wrapper).qrcode({render:'div',text:e,fill:'currentColor'});wrapper.attr('title','')})}); @@ -1191,4 +1191,4 @@ else if(Notification.permission!=='denied'){Notification.requestPermission(funct ;Openrat.Workbench.afterViewLoadedHandler.add(function(e){}); ; ;Openrat.Workbench.afterViewLoadedHandler.add(function(e){Openrat.Workbench.registerOpenClose($(e).find('.or-group.toggle-open-close'))}); -;Openrat.Workbench.afterViewLoadedHandler.add(function(e){var o=$(e).find('form'),r=$(e).find('div.or-dropzone-upload > div.input');r.on('dragenter',function(e){e.stopPropagation();e.preventDefault();$(this).css('border','1px dotted gray')});r.on('dragover',function(e){e.stopPropagation();e.preventDefault()});r.on('drop',function(e){$(this).css('border','1px dotted red');e.preventDefault();var r=e.originalEvent.dataTransfer.files;Openrat.Workbench.handleFileUpload(o,r)});$(e).find('input[type=file]').change(function(){var e=$(this).prop('files');Openrat.Workbench.handleFileUpload(o,e)})});Openrat.Workbench.handleFileUpload=function(e,o){for(let i=0,f;f=o[i];i++){let form_data=new FormData();form_data.append('file',f);form_data.append('action','folder');form_data.append('subaction',$(e).data('method'));form_data.append('output','json');form_data.append('token',$(e).find('input[name=token]').val());form_data.append('id',$(e).find('input[name=id]').val());var r=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(r);$(r).show();$.ajax({'type':'POST',url:'./api/',cache:!1,contentType:!1,processData:!1,data:form_data,success:function(o,a,n){$(r).remove();let oform=new Openrat.Form();oform.doResponse(o,a,e)},error:function(o,a,n){$(e).closest('div.content').removeClass('loader');$(r).remove();let msg;try{let error=jQuery.parseJSON(o.responseText);msg=error.error+'/'+error.description+': '+error.reason}catch(t){msg=o.responseText};Openrat.Workbench.notify('Upload error',msg)}})}}; +;Openrat.Workbench.afterViewLoadedHandler.add(function(e){var o=$(e).find('form'),r=$(e).find('div.or-dropzone-upload > div.input');r.on('dragenter',function(e){e.stopPropagation();e.preventDefault();$(this).css('border','1px dotted gray')});r.on('dragover',function(e){e.stopPropagation();e.preventDefault()});r.on('drop',function(e){$(this).css('border','1px dotted red');e.preventDefault();var r=e.originalEvent.dataTransfer.files;Openrat.Workbench.handleFileUpload(o,r)});$(e).find('input[type=file]').change(function(){var e=$(this).prop('files');Openrat.Workbench.handleFileUpload(o,e)})});Openrat.Workbench.handleFileUpload=function(e,o){for(let i=0,f;f=o[i];i++){let form_data=new FormData();form_data.append('file',f);form_data.append('action','folder');form_data.append('subaction',$(e).data('method'));form_data.append('output','json');form_data.append('token',$(e).find('input[name=token]').val());form_data.append('id',$(e).find('input[name=id]').val());var r=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(r);$(r).show();$.ajax({'type':'POST',url:'./api/',cache:!1,contentType:!1,processData:!1,data:form_data,success:function(o,a,n){$(r).remove();let oform=new Openrat.Form();oform.doResponse(o,a,e)},error:function(o,a,n){$(e).closest('div.content').removeClass('loader');$(r).remove();let msg;try{let error=jQuery.parseJSON(o.responseText);msg=error.error+'/'+error.description+': '+error.reason}catch(t){msg=o.responseText};Openrat.Workbench.notify('Upload error',0,msg)}})}}; diff --git a/modules/cms/ui/themes/default/script/openrat/common.js b/modules/cms/ui/themes/default/script/openrat/common.js @@ -89,7 +89,7 @@ $( function() { // Initial Notices $('.or-initial-notice').each( function() { - Openrat.Workbench.notify('','','info',$(this).text()); + Openrat.Workbench.notify('', 0, '', 'info', $(this).text()); $(this).remove(); }); diff --git a/modules/cms/ui/themes/default/script/openrat/form.js b/modules/cms/ui/themes/default/script/openrat/form.js @@ -103,7 +103,7 @@ Openrat.Form = function() { // Alle vorhandenen Error-Marker entfernen. // Falls wieder ein Fehler auftritt, werden diese erneut gesetzt. - $(this.element).find('.error').removeClass('error'); + $(this.element).find('.or-input.error').removeClass('error'); let params = $(this.element).serializeArray(); let data = {}; @@ -183,12 +183,12 @@ Openrat.Form = function() { try { let error = jQuery.parseJSON( jqXHR.responseText ); - Openrat.Workbench.notify('','','error',error.error,[error.description]); + Openrat.Workbench.notify('', 0, '', 'error', error.error, [error.description]); } catch( e ) { let msg = jqXHR.responseText; - Openrat.Workbench.notify('','','error','Server Error',[msg]); + Openrat.Workbench.notify('', 0, '', 'error', 'Server Error', [msg]); } @@ -226,7 +226,7 @@ Openrat.Form = function() { // gewechselt hat. let notifyBrowser = $(element).data('async'); - Openrat.Workbench.notify(value.type, value.name, value.status, value.text, value.log, notifyBrowser ); // Notice anhängen. + Openrat.Workbench.notify(value.type, value.id, value.name, value.status, value.text, value.log, notifyBrowser); // Notice anhängen. if ( value.status == 'ok' ) // Kein Fehler? { @@ -239,17 +239,12 @@ Openrat.Form = function() { } }); - // Felder mit Fehleingaben markieren, ggf. das übergeordnete Fieldset aktivieren. + // Validation error should mark the input field. $.each(data['errors'], function(idx,value) { - $('input[name='+value+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open'); + $('.or-input[name='+value+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open'); }); // Jetzt das erhaltene Dokument auswerten. - - - if ( data.control.redirect ) - // Redirect - window.location.href = data.control.redirect; } diff --git a/modules/cms/ui/themes/default/script/openrat/view.js b/modules/cms/ui/themes/default/script/openrat/view.js @@ -73,7 +73,7 @@ Openrat.View = function( action,method,id,params ) { loadViewHtmlPromise.fail( function(jqxhr,status,cause) { $(element).html(""); - Openrat.Workbench.notify('','','error','Server Error',['Server Error while requesting url '+url, status]); + Openrat.Workbench.notify('', 0, '', 'error', 'Server Error', ['Server Error while requesting url ' + url, status]); }); // Load the data for this view. diff --git a/modules/cms/ui/themes/default/script/openrat/workbench.js b/modules/cms/ui/themes/default/script/openrat/workbench.js @@ -339,7 +339,7 @@ Openrat.Workbench = new function() * @param msg * @param log */ - this.notify = function( type,name,status,msg,log=[],notifyTheBrowser=false ) + this.notify = function (type, id, name, status, msg, log = [], notifyTheBrowser = false) { // Notice-Bar mit dieser Meldung erweitern. @@ -354,9 +354,8 @@ Openrat.Workbench = new function() $(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>'); $(notice).append(toolbar); - let id = 0; // TODO id of objects to click on if (name) - $(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+type+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+type+'"></i> '+name+'</a></div>'); + $(notice).append('<div class="name clickable"><a href="'+Openrat.Navigator.createShortUrl(type,id)+'" data-type="open" data-action="'+type+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+type+'"></i> '+name+'</a></div>'); $(notice).append( '<div class="text">'+htmlEntities(msg)+'</div>'); diff --git a/modules/cms/ui/themes/default/script/plugin/jquery-plugin-orTree.js b/modules/cms/ui/themes/default/script/plugin/jquery-plugin-orTree.js @@ -73,7 +73,7 @@ jQuery.fn.orTree = function () }).fail(function () { // Ups... aber was können wir hier schon tun, außer hässliche Meldungen anzeigen. - Openrat.Workbench.notify('','','ERROR','Failed to load subtree',[],false); + Openrat.Workbench.notify('', 0, '', 'ERROR', 'Failed to load subtree', [], false); }).always(function () { // Die Loader-Animation entfernen. diff --git a/modules/cms/ui/themes/default/style/openrat-header.less b/modules/cms/ui/themes/default/style/openrat-header.less @@ -51,26 +51,17 @@ cursor: default; } &.search { - .inputholder { + input { + border: 0; margin: 0; padding: 0; - border: 0; + width: 3em; display: inline; - - input { - border: 0; - margin: 0; - padding: 0; - width: 3em; - display: inline; - transition: width 0.3s ease-in-out; - &:focus { - width: 8em; - - } + transition: width 0.3s ease-in-out; + &:focus { + width: 8em; } - } } diff --git a/modules/cms/ui/themes/default/style/openrat-ui.less b/modules/cms/ui/themes/default/style/openrat-ui.less @@ -695,15 +695,11 @@ main .or-form .or-form-actionbar { - - -div.search > div.inputholder { +div.search > .or-input { padding-top: 1px; } -div.inputholder > input, -div.inputholder > textarea, -div.inputholder > select { +.or-input { padding: 2px; margin: 0px; } diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css @@ -892,12 +892,10 @@ main .or-form .or-form-actionbar { -khtml-border-radius: 0.3em; cursor: pointer; } -div.search > div.inputholder { +div.search > .or-input { padding-top: 1px; } -div.inputholder > input, -div.inputholder > textarea, -div.inputholder > select { +.or-input { padding: 2px; margin: 0px; } @@ -968,7 +966,7 @@ img.image-icon { .or-info .or-info-popup > div { display: inline-block; } -/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3BAAIA%3BCACE%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBAAmB%2CMAAM%2CuBAChC%2CwCAAwC%2COAAO%2CuDAC%5C%2FC%2CwCAAwC%2COAAO%2COAFnD%3B%3B%3B%3B%3BAAMF%3BCACE%2CaAAa%2CiBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CoBAAoB%2CMAAM%2C8BACjC%2CkDAAkD%2COAAO%2CuDACzD%2CiDAAiD%2COAAO%2COAF5D%3B%3B%3B%3BAAKF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBACX%2CMAAM%2C8BACF%2CuCAAuC%2COAAO%2CcAC9C%2CsCAAsC%2COAAO%2COAHjD%3B%3BAAMF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3B%3B%3B%3BCAYA%3B%3BAAGA%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2C%2BBAA%2BB%3BCAAS%2CSAAS%2CeAAT%3B%3BAACzC%2CWAAC%2C6BAA6B%3BCAAS%3B%3BAACvC%2CWAAC%2C6BAA6B%3BCAAS%2CSAAS%2CWAAT%3B%3BAACvC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CWAAT%3B%3BAACrC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CYAAT%3B%3BAACrC%2CWAAC%2C6BAA6B%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACvC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CcAAT%3B%3BAACrC%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2C8BAA8B%3BCAAS%2CSAAS%2CqBAAT%3B%3BAACxC%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C%2BBAA%2BB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAEzC%2CWAAC%2CyBAAyB%3BCAAS%3B%3BAACnC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAClC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACnC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CmBAAT%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2C6BAA6B%3BCAAS%2CSAAS%2CYAAT%3B%3BAACvC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CYAAT%3B%3BAACnC%2CWAAC%2C0BAA0B%3BCAAS%2CSAAS%2CaAAT%3B%3BAACpC%2CWAAC%2CgCAAgC%3BCAAS%3B%3BAAC1C%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CgCAAgC%3BCAAS%3B%3BAAC1C%2CWAAC%2C8BAA8B%3BCAAS%3B%3BAACxC%2CWAAC%2CyBAAyB%3BCAAS%3B%3BAACnC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CYAAT%3B%3BAACrC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CiCAAiC%3BCAAS%3B%3BAAC3C%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAErC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAEnC%2CWAAC%3BCAAiC%2CSAAS%2CiBAAT%3B%3BAAClC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CcAAT%3B%3BAACrC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2C0BAA0B%3BCAAS%3B%3BAACpC%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2C0BAA0B%3BCAAS%3B%3BAACpC%2CWAAC%2CuBAAuB%3BCAAS%2CSAAS%2CSAAT%3B%3BAACjC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CsBAAsB%3BCAAS%3B%3BAAChC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAAEjC%2CWAAC%2CsBAAsB%3BCAAS%3B%3BAAChC%2CWAAC%2C0BAA0B%3BCAAS%2CSAAS%2CgBAAT%3B%3BAACpC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CeAAT%3B%3BAAElC%2CWAAC%2CsBAAsB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAChC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CeAAT%3B%3BAAElC%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAElC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAClC%2CWAAC%2C0BAA0B%3BCAAS%2CSAAS%2CeAAT%3B%3BAACpC%2CWAAC%2C4BAA4B%3BCAAS%2CSAAS%2CaAAT%3B%3BAACtC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CcAAT%3B%3BAAClC%2CWAAC%2C8BAA8B%3BCAAS%3B%3BAACxC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CcAAT%3B%3BAACnC%2CWAAC%2CkCAAkC%3BCAAS%2CSAAS%2CsBAAT%3B%3BAAC5C%2CWAAC%2CgCAAgC%3BCAAS%2CSAAS%2CsBAAT%3B%3BAAC1C%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACrC%2CWAAC%2C8BAA8B%3BCAAS%3B%3BAACxC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CyBAAyB%3BCAAS%3B%3BAACnC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CkCAAkC%3BCAAS%3B%3BAAC5C%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAGrC%3BCACE%3B%3BAAgBF%3BCACE%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BAACH%2CGAAG%2CWAAY%3BAACf%2CGAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAGF%2CGAAG%3BCAED%3BCACA%3BCACA%3B%3BCAEA%3BCACA%3BCACA%3B%3BAARF%2CGAAG%2CUAWD%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCAvCF%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3BCAGA%2CuCAAA%3BCACA%2CoCAAA%3BCACA%2C%2BBAAA%3B%3BAAgBF%2CGAAG%2CUAWD%2CIAAG%2COASD%3BCACE%3BCACA%2CeAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGA5BD%2CUAWD%2CIAAG%2COAiBA%2CMACC%3BCACE%3B%3BAAIJ%2CGAlCD%2CUAWD%2CIAAG%2COAuBA%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CGA9CD%2CUAWD%2CIAAG%2COAmCA%2CMAEC%2CIAAG%3BCACD%3B%3BAAjDR%2CGAAG%2CUAWD%2CIAAG%2COA0CD%2CIAAG%3BCACD%3B%3BAAGF%2CGAzDD%2CUAWD%2CIAAG%2COA8CA%3BCACC%2CSAAS%2CEAAT%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2C6BAAA%3BCACA%3BCACA%3BCACA%3B%3BAAnEN%2CGAAG%2CUAWD%2CIAAG%2COA2DD%2CIAAG%3BCACD%3BCACA%3BCACA%3BCACA%3BCACA%2CaAAa%2CiDAAb%3B%3BAAGF%2CGA9ED%2CUAWD%2CIAAG%2COAmEA%2CKACC%2CIAAG%3BCACD%3B%3BAAmBR%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAQF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3B%3BAAIF%2CGAAG%3BAACH%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAaF%2CGAAG%2CKAAM%3BCACP%3BCACA%3B%3BAAGF%2CGAAG%2CKAAM%3BCACP%3B%3BAAGF%3BAACA%3BCACE%3B%3B%3BAAQA%2CaAAC%3BCAEC%3BCACA%3B%3BAAGF%2CaAAC%3BCACC%3BCACA%3B%3B%3BAAOJ%2CGAAG%3BCACD%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CMAAO%2CGAAE%2CMAAO%3BCACjB%3BCACA%3BCAEA%3BCAEA%2C%2BBAAA%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCAEA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3BCACA%3B%3B%3BAAOF%2CGAAG%2CMAAO%2CIAAG%3BCACX%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CqDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CuDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CkDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CoDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%3BAACrB%2CGAAG%3BCACD%2CyBAAA%3BCACA%2CyBAAA%3BCACA%2C2BAAA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CUACE%2CIAAG%2CMAAM%3BCACP%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2CyBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAVJ%2CUAaE%2CIAAG%2CMAAM%2CWAAc%2CMAAG%3BCACxB%3BCACA%3B%3BAAfJ%2CUAkBE%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAzBJ%2CUA4BE%2CIAAG%3BAA5BL%2CUA4BiB%2CIAAG%3BAA5BpB%2CUA4B4B%2CIAAG%3BCAC3B%3BCACA%3BCACA%3B%3BAA%5C%2FBJ%2CUAkCE%2CIAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAIJ%3BCACE%3B%3BAAGF%3BCACE%3B%3B%3B%3B%3BAAMF%2CGAAG%3BCACD%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%3BCACb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%2COAAU%2CMAAG%3BCAC1B%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CKAAI%2CsBAAuB%2CIAAG%3BCACxC%3B%3BAAGF%2CGAAG%2CQAAW%3BCACZ%3B%3BAAQF%2CIAAK%2CSAAS%3BCACZ%3B%3B%3BAAKF%3BCACI%3BCACA%3BCACA%3BCA4CF%3B%3B%3B%3B%3B%3B%3B%3B%3BAA%5C%2FCF%2CQAKI%3BCACI%3B%3BAANR%2CQAQI%3BCACI%3BCACA%3B%3BAAVR%2CQAaI%3BCACI%3B%3BAAdR%2CQAiBE%2CMAAK%2CeAAkB%3BAAjBzB%2CQAkBE%2CMAAK%2CYAAe%3BCAClB%3B%3BAAnBJ%2CQAsBE%3BCACE%3B%3BAAvBJ%2CQA8BE%2CIAAG%2CYAAe%2CMAAG%3BCACnB%3B%3BAA%5C%2FBJ%2CQAkCE%2CMAAK%3BCACH%3BCACA%3BCACA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCACA%3BCACA%3B%3BAA1CJ%2CQAkDE%2CMAAK%3BAAlDP%2CQAkDoB%3BAAlDpB%2CQAkD4B%3BCACxB%3BCACA%3BCACA%2CsBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAxDJ%2CQA4DE%3BCACE%2CyBAAA%3BCACA%3B%3BAA9DJ%2CQAkEE%2CMAAK%3BCACH%3BCACA%2CkBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAxEJ%2CQA4EE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAA%5C%2FEJ%2CQAmFE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAAtFJ%2CQA0FE%2CMAAK%3BCACH%2CSAAS%2CEAAT%3BCACA%3BCACA%3B%3BAA7FJ%2CQAgGE%3BCACE%3BCACA%3B%3BAAlGJ%2CQAgGE%2CaAIE%3BCACE%3B%3BAArGN%2CQAgGE%2CaAOE%3BCACE%3B%3BAAxGN%2CQA%2BGE%3BCAEE%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAzHJ%2CQA%2BGE%2CmBAaC%3BCACE%2CgBAAA%3BCACA%3BCACA%3BCACA%3BCA3eH%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCA2eG%3B%3BAAEA%2CQAtBH%2CmBAaC%2CaASG%3BCACC%3B%3B%3BAAoCP%2CmBA1BuC%3BCA0BvC%2CQAxBI%2CIAAG%3BCAwBP%2CQAxBe%2CIAAG%3BEACZ%3BEACA%3B%3BCAsBN%2CQAnBI%3BEACC%3B%3BCAkBL%2CQAnBI%2CaAEE%3BCAiBN%2CQAnBI%2CaAGE%3BEACE%3B%3BCAeR%2CQAXI%3BEAEE%3BEACA%3B%3BCAQN%2CQAXI%2CmBAKE%3BEACE%3B%3B%3BAASR%3BCACE%2CoBAAA%3BCACA%3BCACA%3BCA5hBA%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCA4hBA%3B%3BAAOF%2CGAAG%2COAAU%2CMAAG%3BCACd%3B%3BAAGF%2CGAAG%2CYAAe%3BAAClB%2CGAAG%2CYAAe%3BAAClB%2CGAAG%2CYAAe%3BCAChB%3BCACA%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%2CaAAa%2CiDAAb%3B%3BAAGF%2CEAAE%3BCACA%3B%3BAAIF%2CGAAG%2CQAAS%3BAACZ%2CGAAG%3BCACD%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3B%3B%3BAAIF%3BCACE%3B%3BAAGF%3BCACE%3BCACA%3BCACA%2CgBAAA%3B%3BAAHF%2CYAKI%3BCACA%2CiBAAA%3BCACA%3BCACA%3BCA7lBF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAAgmBF%3BCAEE%3B%3BAAEA%2CQAAC%2CMACC%3BCACE%3B%3BAANN%2CQAUE%3BCACE%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCArnBF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAonBE%3BCAEA%3B%3BAAtBJ%2CQAUE%2CeAcI%3BCACA%22%7D */ +/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3BAAIA%3BCACE%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBAAmB%2CMAAM%2CuBAChC%2CwCAAwC%2COAAO%2CuDAC%5C%2FC%2CwCAAwC%2COAAO%2COAFnD%3B%3B%3B%3B%3BAAMF%3BCACE%2CaAAa%2CiBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CoBAAoB%2CMAAM%2C8BACjC%2CkDAAkD%2COAAO%2CuDACzD%2CiDAAiD%2COAAO%2COAF5D%3B%3B%3B%3BAAKF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBACX%2CMAAM%2C8BACF%2CuCAAuC%2COAAO%2CcAC9C%2CsCAAsC%2COAAO%2COAHjD%3B%3BAAMF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3B%3B%3B%3BCAYA%3B%3BAAGA%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2C%2BBAA%2BB%3BCAAS%2CSAAS%2CeAAT%3B%3BAACzC%2CWAAC%2C6BAA6B%3BCAAS%3B%3BAACvC%2CWAAC%2C6BAA6B%3BCAAS%2CSAAS%2CWAAT%3B%3BAACvC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CWAAT%3B%3BAACrC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CYAAT%3B%3BAACrC%2CWAAC%2C6BAA6B%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACvC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CcAAT%3B%3BAACrC%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2C8BAA8B%3BCAAS%2CSAAS%2CqBAAT%3B%3BAACxC%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C%2BBAA%2BB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAEzC%2CWAAC%2CyBAAyB%3BCAAS%3B%3BAACnC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAClC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACnC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CmBAAT%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2C6BAA6B%3BCAAS%2CSAAS%2CYAAT%3B%3BAACvC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CYAAT%3B%3BAACnC%2CWAAC%2C0BAA0B%3BCAAS%2CSAAS%2CaAAT%3B%3BAACpC%2CWAAC%2CgCAAgC%3BCAAS%3B%3BAAC1C%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CgCAAgC%3BCAAS%3B%3BAAC1C%2CWAAC%2C8BAA8B%3BCAAS%3B%3BAACxC%2CWAAC%2CyBAAyB%3BCAAS%3B%3BAACnC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CYAAT%3B%3BAACrC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CiCAAiC%3BCAAS%3B%3BAAC3C%2CWAAC%2C%2BBAA%2BB%3BCAAS%3B%3BAACzC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAErC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAEnC%2CWAAC%3BCAAiC%2CSAAS%2CiBAAT%3B%3BAAClC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CcAAT%3B%3BAACrC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2C0BAA0B%3BCAAS%3B%3BAACpC%2CWAAC%2C2BAA2B%3BCAAS%3B%3BAACrC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2C0BAA0B%3BCAAS%3B%3BAACpC%2CWAAC%2CuBAAuB%3BCAAS%2CSAAS%2CSAAT%3B%3BAACjC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2C4BAA4B%3BCAAS%3B%3BAACtC%2CWAAC%2CsBAAsB%3BCAAS%3B%3BAAChC%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAAEjC%2CWAAC%2CsBAAsB%3BCAAS%3B%3BAAChC%2CWAAC%2C0BAA0B%3BCAAS%2CSAAS%2CgBAAT%3B%3BAACpC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CeAAT%3B%3BAAElC%2CWAAC%2CsBAAsB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAChC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CeAAT%3B%3BAAElC%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAElC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAClC%2CWAAC%2C0BAA0B%3BCAAS%2CSAAS%2CeAAT%3B%3BAACpC%2CWAAC%2C4BAA4B%3BCAAS%2CSAAS%2CaAAT%3B%3BAACtC%2CWAAC%2CwBAAwB%3BCAAS%2CSAAS%2CcAAT%3B%3BAAClC%2CWAAC%2C8BAA8B%3BCAAS%3B%3BAACxC%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CcAAT%3B%3BAACnC%2CWAAC%2CkCAAkC%3BCAAS%2CSAAS%2CsBAAT%3B%3BAAC5C%2CWAAC%2CgCAAgC%3BCAAS%2CSAAS%2CsBAAT%3B%3BAAC1C%2CWAAC%2C2BAA2B%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACrC%2CWAAC%2C8BAA8B%3BCAAS%3B%3BAACxC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CyBAAyB%3BCAAS%3B%3BAACnC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CwBAAwB%3BCAAS%3B%3BAAClC%2CWAAC%2CkCAAkC%3BCAAS%3B%3BAAC5C%2CWAAC%2CyBAAyB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAGrC%3BCACE%3B%3BAAgBF%3BCACE%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BAACH%2CGAAG%2CWAAY%3BAACf%2CGAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAGF%2CGAAG%3BCAED%3BCACA%3BCACA%3B%3BCAEA%3BCACA%3BCACA%3B%3BAARF%2CGAAG%2CUAWD%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCAvCF%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3BCAGA%2CuCAAA%3BCACA%2CoCAAA%3BCACA%2C%2BBAAA%3B%3BAAgBF%2CGAAG%2CUAWD%2CIAAG%2COASD%3BCACE%3BCACA%2CeAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGA5BD%2CUAWD%2CIAAG%2COAiBA%2CMACC%3BCACE%3B%3BAAIJ%2CGAlCD%2CUAWD%2CIAAG%2COAuBA%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CGA9CD%2CUAWD%2CIAAG%2COAmCA%2CMAEC%2CIAAG%3BCACD%3B%3BAAjDR%2CGAAG%2CUAWD%2CIAAG%2COA0CD%2CIAAG%3BCACD%3B%3BAAGF%2CGAzDD%2CUAWD%2CIAAG%2COA8CA%3BCACC%2CSAAS%2CEAAT%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2C6BAAA%3BCACA%3BCACA%3BCACA%3B%3BAAnEN%2CGAAG%2CUAWD%2CIAAG%2COA2DD%2CIAAG%3BCACD%3BCACA%3BCACA%3BCACA%3BCACA%2CaAAa%2CiDAAb%3B%3BAAGF%2CGA9ED%2CUAWD%2CIAAG%2COAmEA%2CKACC%2CIAAG%3BCACD%3B%3BAAmBR%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAQF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3B%3BAAIF%2CGAAG%3BAACH%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAaF%2CGAAG%2CKAAM%3BCACP%3BCACA%3B%3BAAGF%2CGAAG%2CKAAM%3BCACP%3B%3BAAGF%3BAACA%3BCACE%3B%3B%3BAAQA%2CaAAC%3BCAEC%3BCACA%3B%3BAAGF%2CaAAC%3BCACC%3BCACA%3B%3B%3BAAOJ%2CGAAG%3BCACD%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CMAAO%2CGAAE%2CMAAO%3BCACjB%3BCACA%3BCAEA%3BCAEA%2C%2BBAAA%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCAEA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3BCACA%3B%3B%3BAAOF%2CGAAG%2CMAAO%2CIAAG%3BCACX%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CqDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CuDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CkDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CoDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%3BAACrB%2CGAAG%3BCACD%2CyBAAA%3BCACA%2CyBAAA%3BCACA%2C2BAAA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CUACE%2CIAAG%2CMAAM%3BCACP%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2CyBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAVJ%2CUAaE%2CIAAG%2CMAAM%2CWAAc%2CMAAG%3BCACxB%3BCACA%3B%3BAAfJ%2CUAkBE%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAzBJ%2CUA4BE%2CIAAG%3BAA5BL%2CUA4BiB%2CIAAG%3BAA5BpB%2CUA4B4B%2CIAAG%3BCAC3B%3BCACA%3BCACA%3B%3BAA%5C%2FBJ%2CUAkCE%2CIAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAIJ%3BCACE%3B%3BAAGF%3BCACE%3B%3B%3B%3B%3BAAMF%2CGAAG%3BCACD%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%3BCACb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%2COAAU%2CMAAG%3BCAC1B%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CKAAI%2CsBAAuB%2CIAAG%3BCACxC%3B%3BAAGF%2CGAAG%2CQAAW%3BCACZ%3B%3BAAQF%2CIAAK%2CSAAS%3BCACZ%3B%3B%3BAAKF%3BCACI%3BCACA%3BCACA%3BCA4CF%3B%3B%3B%3B%3B%3B%3B%3B%3BAA%5C%2FCF%2CQAKI%3BCACI%3B%3BAANR%2CQAQI%3BCACI%3BCACA%3B%3BAAVR%2CQAaI%3BCACI%3B%3BAAdR%2CQAiBE%2CMAAK%2CeAAkB%3BAAjBzB%2CQAkBE%2CMAAK%2CYAAe%3BCAClB%3B%3BAAnBJ%2CQAsBE%3BCACE%3B%3BAAvBJ%2CQA8BE%2CIAAG%2CYAAe%2CMAAG%3BCACnB%3B%3BAA%5C%2FBJ%2CQAkCE%2CMAAK%3BCACH%3BCACA%3BCACA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCACA%3BCACA%3B%3BAA1CJ%2CQAkDE%2CMAAK%3BAAlDP%2CQAkDoB%3BAAlDpB%2CQAkD4B%3BCACxB%3BCACA%3BCACA%2CsBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAxDJ%2CQA4DE%3BCACE%2CyBAAA%3BCACA%3B%3BAA9DJ%2CQAkEE%2CMAAK%3BCACH%3BCACA%2CkBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAxEJ%2CQA4EE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAA%5C%2FEJ%2CQAmFE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAAtFJ%2CQA0FE%2CMAAK%3BCACH%2CSAAS%2CEAAT%3BCACA%3BCACA%3B%3BAA7FJ%2CQAgGE%3BCACE%3BCACA%3B%3BAAlGJ%2CQAgGE%2CaAIE%3BCACE%3B%3BAArGN%2CQAgGE%2CaAOE%3BCACE%3B%3BAAxGN%2CQA%2BGE%3BCAEE%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAzHJ%2CQA%2BGE%2CmBAaC%3BCACE%2CgBAAA%3BCACA%3BCACA%3BCACA%3BCA3eH%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCA2eG%3B%3BAAEA%2CQAtBH%2CmBAaC%2CaASG%3BCACC%3B%3B%3BAAoCP%2CmBA1BuC%3BCA0BvC%2CQAxBI%2CIAAG%3BCAwBP%2CQAxBe%2CIAAG%3BEACZ%3BEACA%3B%3BCAsBN%2CQAnBI%3BEACC%3B%3BCAkBL%2CQAnBI%2CaAEE%3BCAiBN%2CQAnBI%2CaAGE%3BEACE%3B%3BCAeR%2CQAXI%3BEAEE%3BEACA%3B%3BCAQN%2CQAXI%2CmBAKE%3BEACE%3B%3B%3BAASR%3BCACE%2CoBAAA%3BCACA%3BCACA%3BCA5hBA%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCA4hBA%3B%3BAAKF%2CGAAG%2COAAU%3BCACX%3B%3BAAGF%3BCACE%3BCACA%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%2CaAAa%2CiDAAb%3B%3BAAGF%2CEAAE%3BCACA%3B%3BAAIF%2CGAAG%2CQAAS%3BAACZ%2CGAAG%3BCACD%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3B%3B%3BAAIF%3BCACE%3B%3BAAGF%3BCACE%3BCACA%3BCACA%2CgBAAA%3B%3BAAHF%2CYAKI%3BCACA%2CiBAAA%3BCACA%3BCACA%3BCAzlBF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAA4lBF%3BCAEE%3B%3BAAEA%2CQAAC%2CMACC%3BCACE%3B%3BAANN%2CQAUE%3BCACE%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCAjnBF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAgnBE%3BCAEA%3B%3BAAtBJ%2CQAUE%2CeAcI%3BCACA%22%7D */ /* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-header */ /* H e a d e r */ #title { @@ -1014,13 +1012,7 @@ img.image-icon { .or-menu .or-menu-group div.toolbar-icon.menu { cursor: default; } -.or-menu .or-menu-group div.toolbar-icon.search .inputholder { - margin: 0; - padding: 0; - border: 0; - display: inline; -} -.or-menu .or-menu-group div.toolbar-icon.search .inputholder input { +.or-menu .or-menu-group div.toolbar-icon.search input { border: 0; margin: 0; padding: 0; @@ -1028,7 +1020,7 @@ img.image-icon { display: inline; transition: width 0.3s ease-in-out; } -.or-menu .or-menu-group div.toolbar-icon.search .inputholder input:focus { +.or-menu .or-menu-group div.toolbar-icon.search input:focus { width: 8em; } .or-menu .or-menu-group div.toolbar-icon div.dropdown { @@ -1070,7 +1062,7 @@ img.image-icon { .or-menu.open .toolbar-icon.open > div.dropdown { display: block; } -/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-header.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAACA%3BCAEI%3BCACA%3B%3BAAGJ%3BCAEI%3BCACA%3B%3B%3BAAHJ%2CQAKI%3BCACI%3B%3B%3BAAGA%2CQAJJ%2CeAIK%2CeAAe%2CGACZ%2CIAAG%3BCACC%3B%3BAAXhB%2CQAKI%2CeASI%2CEAAC%3BCAEG%3B%3BAAhBZ%2CQAKI%2CeAcI%2CIAAM%2CMAAG%3BCACL%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAxBZ%2CQAKI%2CeAsBI%2CIAAG%3BCACC%3BCAEA%3BCACA%3B%3B%3B%3BAAGA%2CQA7BR%2CeAsBI%2CIAAG%2CaAOE%3BAACD%2CQA9BR%2CeAsBI%2CIAAG%2CaAQE%3BAACD%2CQA%5C%2FBR%2CeAsBI%2CIAAG%2CaASE%3BCACG%3BCACA%3BCACA%3B%3BAAGJ%2CQArCR%2CeAsBI%2CIAAG%2CaAeE%3BCACG%3B%3BAAEJ%2CQAxCR%2CeAsBI%2CIAAG%2CaAkBE%2COACG%3BCACI%3BCACA%3BCACA%3BCACA%3B%3BAALR%2CQAxCR%2CeAsBI%2CIAAG%2CaAkBE%2COACG%2CaAMI%3BCACI%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2CkCAAA%3B%3BAACA%2CQAtDpB%2CeAsBI%2CIAAG%2CaAkBE%2COACG%2CaAMI%2CMAOK%3BCACG%3B%3BAA5D5B%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%2CgBAAA%3BCAEA%3BCACA%3BCACA%3B%3BAA%5C%2FEhB%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%2CSAWC%2CIAAG%3BCACC%3B%3B%3BAAlFpB%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%2CSAWC%2CIAAG%2CMAGG%3BCACE%3BCACA%3BCACA%2CgBAAA%3B%3BAAvFxB%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%2CSAWC%2CIAAG%2CMAGG%2CIAKE%3BCACI%3B%3BAA1F5B%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%2CSAWC%2CIAAG%2CMAGG%2CIASE%2CKAAI%3BCACA%3B%3B%3BAA9F5B%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%2CSAWC%2CIAAG%2CMAkBG%3BCACE%3BCACA%3B%3BAArGxB%2CQAKI%2CeAsBI%2CIAAG%2CaA2CC%2CIAAG%2CSAmCC%2CIAAG%3BCACC%3BCACA%3BCACA%3BCACA%3B%3BAAShB%2CQAAC%2CKACG%2CcAAa%2CKACP%2CMAAG%3BCACD%22%7D */ +/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-header.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAACA%3BCAEI%3BCACA%3B%3BAAGJ%3BCAEI%3BCACA%3B%3B%3BAAHJ%2CQAKI%3BCACI%3B%3B%3BAAGA%2CQAJJ%2CeAIK%2CeAAe%2CGACZ%2CIAAG%3BCACC%3B%3BAAXhB%2CQAKI%2CeASI%2CEAAC%3BCAEG%3B%3BAAhBZ%2CQAKI%2CeAcI%2CIAAM%2CMAAG%3BCACL%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAxBZ%2CQAKI%2CeAsBI%2CIAAG%3BCACC%3BCAEA%3BCACA%3B%3B%3B%3BAAGA%2CQA7BR%2CeAsBI%2CIAAG%2CaAOE%3BAACD%2CQA9BR%2CeAsBI%2CIAAG%2CaAQE%3BAACD%2CQA%5C%2FBR%2CeAsBI%2CIAAG%2CaASE%3BCACG%3BCACA%3BCACA%3B%3BAAGJ%2CQArCR%2CeAsBI%2CIAAG%2CaAeE%3BCACG%3B%3BAAEJ%2CQAxCR%2CeAsBI%2CIAAG%2CaAkBE%2COACG%3BCACI%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2CkCAAA%3B%3BAACA%2CQAhDhB%2CeAsBI%2CIAAG%2CaAkBE%2COACG%2CMAOK%3BCACG%3B%3BAAtDxB%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%2CgBAAA%3BCAEA%3BCACA%3BCACA%3B%3BAAtEhB%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%2CSAWC%2CIAAG%3BCACC%3B%3B%3BAAzEpB%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%2CSAWC%2CIAAG%2CMAGG%3BCACE%3BCACA%3BCACA%2CgBAAA%3B%3BAA9ExB%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%2CSAWC%2CIAAG%2CMAGG%2CIAKE%3BCACI%3B%3BAAjF5B%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%2CSAWC%2CIAAG%2CMAGG%2CIASE%2CKAAI%3BCACA%3B%3B%3BAArF5B%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%2CSAWC%2CIAAG%2CMAkBG%3BCACE%3BCACA%3B%3BAA5FxB%2CQAKI%2CeAsBI%2CIAAG%2CaAkCC%2CIAAG%2CSAmCC%2CIAAG%3BCACC%3BCACA%3BCACA%3BCACA%3B%3BAAShB%2CQAAC%2CKACG%2CcAAa%2CKACP%2CMAAG%3BCACD%22%7D */ /* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-navigation */ /* N a v i g a t i o n */ #navigation ul.or-navtree-list { diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css @@ -1,6 +1,6 @@ /*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family: 'Oxygen', 'Roboto', -apple-system, BlinkMacSystemFont, "Segoe UI", "Open Sans", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;font-size: 0.8em;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%}body{margin: 0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display: block}audio,canvas,progress,video{display: inline-block;vertical-align: baseline}audio:not([controls]){display: none;height: 0}[hidden],template{display: none}a{background: transparent}a:active,a:hover{outline: 0}abbr[title]{border-bottom: 1px dotted}b,strong{font-weight: bold}dfn{font-style: italic}h1{font-size: 1.2em;margin: .67em 0}mark{background: #ff0;color: #000}small{font-size: 80%}sub,sup{font-size: 75%;line-height: 0;position: relative;vertical-align: baseline}sup{top: -0.5em}sub{bottom: -0.25em}img{border: 0}svg:not(:root){overflow: hidden}figure{margin: 1em 40px}hr{-moz-box-sizing: content-box;box-sizing: content-box;height: 0}pre{overflow: auto}code,kbd,pre,samp{font-family: 'Source Code Pro', monospace, monospace;font-size: 1em}button,input,optgroup,select,textarea{color: inherit;background-color: inherit;font: inherit;margin: 0}button{overflow: visible}button,select{text-transform: none}button,html input[type="button"]{-webkit-appearance: button;cursor: pointer}button[disabled],html input[disabled]{cursor: default}button input::-moz-focus-inner{border: 0;padding: 0}input{line-height: normal}input[type="reset"],input[type="submit"]{-webkit-appearance: button;cursor: pointer}input[type="checkbox"],input[type="radio"]{box-sizing: border-box;padding: 0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height: auto}input[type="search"]{-webkit-appearance: textfield;-moz-box-sizing: content-box;-webkit-box-sizing: content-box;box-sizing: content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance: none}fieldset{border: 1px solid #c0c0c0;margin: 0 2px;padding: .35em .625em .75em}legend{border: 0;padding: 0}textarea{overflow: auto}optgroup{font-weight: bold}table{border-collapse: collapse;border-spacing: 0}td,th{padding: 0;text-align: left}*,::before,::after{box-sizing: border-box}.initial-hidden{display: none}.sort-value{display: none}legend{font-size: 1.1em;font-weight: bold;padding: 0 .5em} -@font-face{font-family: 'Oxygen';font-style: normal;font-weight: 400;src: local('Oxygen Regular'), local('Oxygen-Regular'), url('../font/oxygen-v7-latin-regular.woff') format('woff2'), url('../font/oxygen-v7-latin-regular.woff') format('woff')}@font-face{font-family: 'Source Code Pro';font-style: normal;font-weight: 400;src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../font/source-code-pro-v8-latin-regular.woff2') format('woff2'), url('../font/source-code-pro-v8-latin-regular.woff') format('woff')}@font-face{font-family: 'Material Icons';font-style: normal;font-weight: 400;src: local('Material Icons'), local('MaterialIcons-Regular'), url('../font/MaterialIcons-Regular.woff2') format('woff2'), url('../font/MaterialIcons-Regular.woff') format('woff')}.image-icon{font-family: 'Material Icons';font-weight: normal;font-style: normal;display: inline-block;text-transform: none;letter-spacing: normal;word-wrap: normal;white-space: nowrap;direction: ltr;font-feature-settings: 'liga'}.image-icon.image-icon--action-el_text:after{content: "spellcheck"}.image-icon.image-icon--action-el_longtext:after{content: "view_headline"}.image-icon.image-icon--action-el_select:after{content: "list"}.image-icon.image-icon--action-el_number:after{content: "looks_one"}.image-icon.image-icon--action-el_link:after{content: "call_made"}.image-icon.image-icon--action-el_date:after{content: "date_range"}.image-icon.image-icon--action-el_insert:after{content: "keyboard_return"}.image-icon.image-icon--action-el_copy:after{content: "flip_to_back"}.image-icon.image-icon--action-el_linkinfo:after{content: "info"}.image-icon.image-icon--action-el_linkdate:after{content: "info"}.image-icon.image-icon--action-el_code:after{content: "code"}.image-icon.image-icon--action-el_dynamic:after{content: "play_circle_outline"}.image-icon.image-icon--action-el_info:after{content: "info"}.image-icon.image-icon--action-el_infodate:after{content: "info"}.image-icon.image-icon--action-el_checkbox:after{content: "check_box"}.image-icon.image-icon--action-image:after{content: "image"}.image-icon.image-icon--action-link:after{content: "call_made"}.image-icon.image-icon--action-url:after{content: "link"}.image-icon.image-icon--action-alias:after{content: "bookmark_border"}.image-icon.image-icon--action-text:after{content: "text_format"}.image-icon.image-icon--action-page:after{content: "insert_drive_file"}.image-icon.image-icon--action-file:after{content: "save"}.image-icon.image-icon--action-modellist:after{content: "device_hub"}.image-icon.image-icon--action-model:after{content: "device_hub"}.image-icon.image-icon--action-folder:after{content: "folder_open"}.image-icon.image-icon--action-languagelist:after{content: "language"}.image-icon.image-icon--action-language:after{content: "language"}.image-icon.image-icon--action-template:after{content: "receipt"}.image-icon.image-icon--action-templatelist:after{content: "receipt"}.image-icon.image-icon--action-groupllist:after{content: "group"}.image-icon.image-icon--action-group:after{content: "group"}.image-icon.image-icon--action-userlist:after{content: "person"}.image-icon.image-icon--action-user:after{content: "person"}.image-icon.image-icon--action-profile:after{content: "person_pin"}.image-icon.image-icon--method-settings:after{content: "settings"}.image-icon.image-icon--action-configuration:after{content: "settings"}.image-icon.image-icon--action-projectlist:after{content: "list"}.image-icon.image-icon--action-project:after{content: "account_balance"}.image-icon.image-icon--action-macro:after{content: "data_usage"}.image-icon.image-icon--action-membership{content: "card_membership"}.image-icon.image-icon--method-password:after{content: "lock"}.image-icon.image-icon--method-publish:after{content: "cloud_upload"}.image-icon.image-icon--method-show:after{content: "slideshow"}.image-icon.image-icon--method-src:after{content: "code"}.image-icon.image-icon--method-acl:after{content: "https"}.image-icon.image-icon--method-rights:after{content: "https"}.image-icon.image-icon--method-archive:after{content: "schedule"}.image-icon.image-icon--method-mail:after{content: "mail"}.image-icon.image-icon--method-search:after{content: "search"}.image-icon.image-icon--method-add:after{content: "add_box"}.image-icon.image-icon--menu-close:after{content: "close"}.image-icon.image-icon--menu-fullscreen:after{content: "fullscreen"}.image-icon.image-icon--menu-edit:after{content: "description"}.image-icon.image-icon--menu-extra:after{content: "build"}.image-icon.image-icon--menu-menu:after{content: "menu"}.image-icon.image-icon--menu-minimize:after{content: "compare_arrows"}.image-icon.image-icon--menu-qrcode:after{content: "phone_android"}.image-icon.image-icon--node-open:after{content: "expand_more"}.image-icon.image-icon--node-closed:after{content: "chevron_right"}.image-icon.image-icon--form-ok:after{content: "done"}.image-icon.image-icon--form-cancel:after{content: "clear"}.image-icon.image-icon--editor-bold:after{content: "format_bold"}.image-icon.image-icon--editor-italic:after{content: "format_italic"}.image-icon.image-icon--editor-headline:after{content: "format_size"}.image-icon.image-icon--editor-help:after{content: "help_outline"}.image-icon.image-icon--editor-fullscreen:after{content: "fullscreen"}.image-icon.image-icon--editor-quote:after{content: "format_quote"}.image-icon.image-icon--editor-unnumberedlist:after{content: "format_list_bulleted"}.image-icon.image-icon--editor-numberedlist:after{content: "format_list_numbered"}.image-icon.image-icon--editor-preview:after{content: "desktop_windows"}.image-icon.image-icon--editor-sidebyside:after{content: "flip"}.image-icon.image-icon--editor-link:after{content: "link"}.image-icon.image-icon--editor-image:after{content: "image"}.image-icon.image-icon--editor-undo:after{content: "undo"}.image-icon.image-icon--editor-redo:after{content: "redo"}.image-icon.image-icon--editor-code:after{content: "code"}.image-icon.image-icon--editor-horizontalrule:after{content: "remove"}.image-icon.image-icon--editor-table:after{content: "view_comfy"}.editor-toolbar{font-size: 1.5em}iframe{width: 100%;height: 500px;display: block}div.breadcrumb,div.breadcrumb a,div.panel > div.title{font-weight: bold}div#noticebar{display: block;position: fixed;bottom: 40px;right: 40px;width: 25em;z-index: 113}div#noticebar div.notice{border: 2px solid #000;padding: 1.1em;margin: 5px;position: relative;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;-webkit-box-shadow: 3px 2px 5px #000;-moz-box-shadow: 3px 2px 5px #000;box-shadow: 3px 2px 5px #000}div#noticebar div.notice .or-notice-toolbar{float: right;margin: 0 .2em;font-size: 2em;color: gray;cursor: pointer}div#noticebar div.notice:hover .or-notice-toolbar{color: black}div#noticebar div.notice.full{display: block;position: fixed;bottom: 10%;top: 10%;right: 10%;left: 10%;width: 80%;z-index: 114}div#noticebar div.notice.error div.text{font-weight: bold}div#noticebar div.notice div.text{font-size: 1.1em}div#noticebar div.notice:after{content: '';position: absolute;right: 0;top: 50%;width: 0;height: 0;border: 1em solid transparent;border-right: 0;margin-top: -1em;margin-right: -1em}div#noticebar div.notice div.log{display: none;position: relative;max-height: 90%;overflow: auto;font-family: 'Source Code Pro', Monospace, Monospaced, Courier}div#noticebar div.notice.full div.log{display: block}div.onrowvisible{visibility: hidden;display: inline}a:link,a:visited{font-weight: normal;text-decoration: none}a:active,a:hover{font-weight: normal;text-decoration: none}img[align=left],img[align=right]{padding-right: 1px;padding-left: 1px}div.logo h2{font-weight: normal;font-size: 24px}div.logo p{font-size: 13px}label,.clickable{cursor: pointer}.or-droppable--active{background-color: #2E8B57 !important;cursor: move}.or-droppable--hover{background-color: #00d95a !important;cursor: move}img.icon{padding: 4px;width: 16px;height: 16px}div.panel ul.views li{vertical-align: middle;padding: 0px;cursor: pointer;border-right: 1px solid #000;-moz-border-radius-topleft: 5px;-webkit-border-radius-topleft: 5px;-khtml-border-top-radius-topleft: 5px;-moz-border-radius-topright: 5px;-webkit-border-radius-topright: 5px;-khtml-border-top-radius-topright: 5px;border-top-right-radius: 5px;display: inline;white-space: nowrap;float: left}div.panel{margin: 0px;padding: 0px}div.panel div.status{padding: 10px}div.panel div.status div.error,div.message.error{background: url(../images/notice_error.png) no-repeat;background-position: 5px 7px}div.panel div.status div.warn,div.message.warn{background: url(../images/notice_warning.png) no-repeat;background-position: 5px 7px}div.panel div.status div.ok,div.message.ok{background: url(../images/notice_ok.png) no-repeat;background-position: 5px 7px}div.panel div.status div.info,div.message.info{background: url(../images/notice_info.png) no-repeat;background-position: 5px 7px}div.panel div.status div,div.message{border: 1px solid #000;padding: 5px 0px 5px 25px;margin: 10px 10px 20px 10px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.panel.fullscreen{display: block;z-index: 109;position: fixed;top: 0;left: 0;background-color: #000;margin: 0px;width: 100% !important;height: 100% !important}#workbench div.panel.fullscreen > div.content{width: 100% !important;height: 100% !important}#workbench div.panel{border: 1px solid #000;margin: 0px;padding: 0px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.container,#workbench div.panel,#workbench div.divider{display: inline;float: left;margin: 0px}#workbench div.panel > div.content{overflow: auto}.invisible{visibility: hidden}.visible{visibility: visible}div.panel{position: relative}div.content div.bottom{height: 55px;width: 100%;position: absolute;padding-right: 40px;bottom: 0px;right: 0px;xvisibility: hidden}div.content div.bottom > div.command{xvisibility: visible;float: right;z-index: 20}div.content form[data-autosave='true'] div.command{display: none}div.content > form{padding-bottom: 45px}main .or-form .or-form-actionbar{display: none}.or-form{display: flex;height: 100%;flex-direction: column;padding: 1em}.or-form .or-form-headline{height: 2em}.or-form .or-form-content{flex-grow: 1;overflow-y: auto}.or-form .or-form-actionbar{height: 3em}.or-form input[type=checkbox] + label,.or-form input[type=radio] + label{width: 80%}.or-form .headline{font-size: 1.8em}.or-form div.inputholder > div.dropdown{width: 70%}.or-form input.submit{padding: 7px;border: 0px;-moz-border-radius: 7px;-webkit-border-radius: 7px;-khtml-border-radius: 7px;border-radius: 7px;margin-left: 20px;cursor: pointer}.or-form input[type=text],.or-form select,.or-form textarea{width: 100%;padding: 12px;border: 1px solid #ccc;border-radius: 4px;box-sizing: border-box;resize: vertical}.or-form label{padding: 12px 12px 12px 0;display: inline-block}.or-form input[type=submit]{color: white;padding: 12px 20px;border: none;border-radius: 4px;cursor: pointer;float: right}.or-form div.label{float: left;width: 25%;margin-top: 6px}.or-form div.input{float: left;width: 75%;margin-top: 6px}.or-form .line:after{content: "";display: table;clear: both}.or-form .or-form-row{display: flex;align-items: center}.or-form .or-form-row .or-form-label{width: 25%}.or-form .or-form-row .or-form-input{width: 75%}.or-form .or-form-actionbar{position: sticky;bottom: 0;left: 0;right: 0;display: flex;justify-content: end;padding: 1em;height: auto}.or-form .or-form-actionbar .or-form-btn{padding: 1em 2em;margin-left: 1.5em;min-width: 14em;border: 0;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em;cursor: pointer}.or-form .or-form-actionbar .or-form-btn--primary{font-weight: bold}@media screen and (max-width: 65rem){.or-form div.label,.or-form div.input{width: 100%;margin-top: 0}.or-form .or-form-row{flex-direction: column}.or-form .or-form-row .or-form-label,.or-form .or-form-row .or-form-input{width: 100%}.or-form .or-form-actionbar{align-items: center;display: block}.or-form .or-form-actionbar .or-form-btn{width: 90%}}.or-link-btn{padding: .5em 1em;min-width: 5em;border: 0;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;cursor: pointer}div.search > div.inputholder{padding-top: 1px}div.inputholder > input,div.inputholder > textarea,div.inputholder > select{padding: 2px;margin: 0px}fieldset > div input.name,fieldset > div span.name{font-weight: bold}fieldset > div input.filename,fieldset > div input.extension,fieldset > div input.ansidate,fieldset > div span.filename,fieldset > div span.extension,fieldset > div span.ansidate{font-family: 'Source Code Pro', Monospace, Monospaced, Courier}dl.notice{padding: 15px}div.content pre,div.dropdown{min-width: 150px;max-width: 450px}img.image-icon{visibility: hidden}.CodeMirror{height: auto}.or-linklist{display: flex;flex-direction: column;padding: 10% 20%}.or-linklist > .or-linklist-line{border: 1px solid;margin-top: 1em;padding: 1em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}.or-info{position: relative}.or-info:hover .or-info-popup{display: block}.or-info .or-info-popup{display: none;position: absolute;top: 0px;left: 0px;overflow: visible;border: 0.5em;font-size: 2em;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;padding: 1.0em;z-index: 105}.or-info .or-info-popup > div{display: inline-block} -#title{overflow: hidden;padding: 5px}.or-menu{display: flex;justify-content: space-between}.or-menu .or-menu-group{display: flex}.or-menu .or-menu-group:nth-last-child(1) div.dropdown{right: 10px}.or-menu .or-menu-group i.image-icon{width: 1.1em}.or-menu .or-menu-group div > div.arrow-down{width: 0;height: 0;margin: 6px;padding: 0px;margin-top: 10px}.or-menu .or-menu-group div.toolbar-icon{padding: 2px;margin-left: 10px;float: left}.or-menu .or-menu-group div.toolbar-icon.user,.or-menu .or-menu-group div.toolbar-icon.search,.or-menu .or-menu-group div.toolbar-icon.history{float: right;margin-right: 10px;margin-left: 10px}.or-menu .or-menu-group div.toolbar-icon.menu{cursor: default}.or-menu .or-menu-group div.toolbar-icon.search .inputholder{margin: 0;padding: 0;border: 0;display: inline}.or-menu .or-menu-group div.toolbar-icon.search .inputholder input{border: 0;margin: 0;padding: 0;width: 3em;display: inline;transition: width .3s ease-in-out}.or-menu .or-menu-group div.toolbar-icon.search .inputholder input:focus{width: 8em}.or-menu .or-menu-group div.toolbar-icon div.dropdown{z-index: 120;min-width: 250px;display: none;position: absolute;padding: 5px 0px;font-style: normal;font-weight: normal;text-decoration: none}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry{padding: 0}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a{display: flex;align-items: center;padding: 0 .5em}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a *{margin: 0.25em}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a span:first-of-type{flex: 1}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > .text{display: block;margin: 10px}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.divide{height: 1px;width: 100%;margin-top: 5px;margin-bottom: 5px}.or-menu.open .toolbar-icon.open > div.dropdown{display: block} +@font-face{font-family: 'Oxygen';font-style: normal;font-weight: 400;src: local('Oxygen Regular'), local('Oxygen-Regular'), url('../font/oxygen-v7-latin-regular.woff') format('woff2'), url('../font/oxygen-v7-latin-regular.woff') format('woff')}@font-face{font-family: 'Source Code Pro';font-style: normal;font-weight: 400;src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../font/source-code-pro-v8-latin-regular.woff2') format('woff2'), url('../font/source-code-pro-v8-latin-regular.woff') format('woff')}@font-face{font-family: 'Material Icons';font-style: normal;font-weight: 400;src: local('Material Icons'), local('MaterialIcons-Regular'), url('../font/MaterialIcons-Regular.woff2') format('woff2'), url('../font/MaterialIcons-Regular.woff') format('woff')}.image-icon{font-family: 'Material Icons';font-weight: normal;font-style: normal;display: inline-block;text-transform: none;letter-spacing: normal;word-wrap: normal;white-space: nowrap;direction: ltr;font-feature-settings: 'liga'}.image-icon.image-icon--action-el_text:after{content: "spellcheck"}.image-icon.image-icon--action-el_longtext:after{content: "view_headline"}.image-icon.image-icon--action-el_select:after{content: "list"}.image-icon.image-icon--action-el_number:after{content: "looks_one"}.image-icon.image-icon--action-el_link:after{content: "call_made"}.image-icon.image-icon--action-el_date:after{content: "date_range"}.image-icon.image-icon--action-el_insert:after{content: "keyboard_return"}.image-icon.image-icon--action-el_copy:after{content: "flip_to_back"}.image-icon.image-icon--action-el_linkinfo:after{content: "info"}.image-icon.image-icon--action-el_linkdate:after{content: "info"}.image-icon.image-icon--action-el_code:after{content: "code"}.image-icon.image-icon--action-el_dynamic:after{content: "play_circle_outline"}.image-icon.image-icon--action-el_info:after{content: "info"}.image-icon.image-icon--action-el_infodate:after{content: "info"}.image-icon.image-icon--action-el_checkbox:after{content: "check_box"}.image-icon.image-icon--action-image:after{content: "image"}.image-icon.image-icon--action-link:after{content: "call_made"}.image-icon.image-icon--action-url:after{content: "link"}.image-icon.image-icon--action-alias:after{content: "bookmark_border"}.image-icon.image-icon--action-text:after{content: "text_format"}.image-icon.image-icon--action-page:after{content: "insert_drive_file"}.image-icon.image-icon--action-file:after{content: "save"}.image-icon.image-icon--action-modellist:after{content: "device_hub"}.image-icon.image-icon--action-model:after{content: "device_hub"}.image-icon.image-icon--action-folder:after{content: "folder_open"}.image-icon.image-icon--action-languagelist:after{content: "language"}.image-icon.image-icon--action-language:after{content: "language"}.image-icon.image-icon--action-template:after{content: "receipt"}.image-icon.image-icon--action-templatelist:after{content: "receipt"}.image-icon.image-icon--action-groupllist:after{content: "group"}.image-icon.image-icon--action-group:after{content: "group"}.image-icon.image-icon--action-userlist:after{content: "person"}.image-icon.image-icon--action-user:after{content: "person"}.image-icon.image-icon--action-profile:after{content: "person_pin"}.image-icon.image-icon--method-settings:after{content: "settings"}.image-icon.image-icon--action-configuration:after{content: "settings"}.image-icon.image-icon--action-projectlist:after{content: "list"}.image-icon.image-icon--action-project:after{content: "account_balance"}.image-icon.image-icon--action-macro:after{content: "data_usage"}.image-icon.image-icon--action-membership{content: "card_membership"}.image-icon.image-icon--method-password:after{content: "lock"}.image-icon.image-icon--method-publish:after{content: "cloud_upload"}.image-icon.image-icon--method-show:after{content: "slideshow"}.image-icon.image-icon--method-src:after{content: "code"}.image-icon.image-icon--method-acl:after{content: "https"}.image-icon.image-icon--method-rights:after{content: "https"}.image-icon.image-icon--method-archive:after{content: "schedule"}.image-icon.image-icon--method-mail:after{content: "mail"}.image-icon.image-icon--method-search:after{content: "search"}.image-icon.image-icon--method-add:after{content: "add_box"}.image-icon.image-icon--menu-close:after{content: "close"}.image-icon.image-icon--menu-fullscreen:after{content: "fullscreen"}.image-icon.image-icon--menu-edit:after{content: "description"}.image-icon.image-icon--menu-extra:after{content: "build"}.image-icon.image-icon--menu-menu:after{content: "menu"}.image-icon.image-icon--menu-minimize:after{content: "compare_arrows"}.image-icon.image-icon--menu-qrcode:after{content: "phone_android"}.image-icon.image-icon--node-open:after{content: "expand_more"}.image-icon.image-icon--node-closed:after{content: "chevron_right"}.image-icon.image-icon--form-ok:after{content: "done"}.image-icon.image-icon--form-cancel:after{content: "clear"}.image-icon.image-icon--editor-bold:after{content: "format_bold"}.image-icon.image-icon--editor-italic:after{content: "format_italic"}.image-icon.image-icon--editor-headline:after{content: "format_size"}.image-icon.image-icon--editor-help:after{content: "help_outline"}.image-icon.image-icon--editor-fullscreen:after{content: "fullscreen"}.image-icon.image-icon--editor-quote:after{content: "format_quote"}.image-icon.image-icon--editor-unnumberedlist:after{content: "format_list_bulleted"}.image-icon.image-icon--editor-numberedlist:after{content: "format_list_numbered"}.image-icon.image-icon--editor-preview:after{content: "desktop_windows"}.image-icon.image-icon--editor-sidebyside:after{content: "flip"}.image-icon.image-icon--editor-link:after{content: "link"}.image-icon.image-icon--editor-image:after{content: "image"}.image-icon.image-icon--editor-undo:after{content: "undo"}.image-icon.image-icon--editor-redo:after{content: "redo"}.image-icon.image-icon--editor-code:after{content: "code"}.image-icon.image-icon--editor-horizontalrule:after{content: "remove"}.image-icon.image-icon--editor-table:after{content: "view_comfy"}.editor-toolbar{font-size: 1.5em}iframe{width: 100%;height: 500px;display: block}div.breadcrumb,div.breadcrumb a,div.panel > div.title{font-weight: bold}div#noticebar{display: block;position: fixed;bottom: 40px;right: 40px;width: 25em;z-index: 113}div#noticebar div.notice{border: 2px solid #000;padding: 1.1em;margin: 5px;position: relative;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;-webkit-box-shadow: 3px 2px 5px #000;-moz-box-shadow: 3px 2px 5px #000;box-shadow: 3px 2px 5px #000}div#noticebar div.notice .or-notice-toolbar{float: right;margin: 0 .2em;font-size: 2em;color: gray;cursor: pointer}div#noticebar div.notice:hover .or-notice-toolbar{color: black}div#noticebar div.notice.full{display: block;position: fixed;bottom: 10%;top: 10%;right: 10%;left: 10%;width: 80%;z-index: 114}div#noticebar div.notice.error div.text{font-weight: bold}div#noticebar div.notice div.text{font-size: 1.1em}div#noticebar div.notice:after{content: '';position: absolute;right: 0;top: 50%;width: 0;height: 0;border: 1em solid transparent;border-right: 0;margin-top: -1em;margin-right: -1em}div#noticebar div.notice div.log{display: none;position: relative;max-height: 90%;overflow: auto;font-family: 'Source Code Pro', Monospace, Monospaced, Courier}div#noticebar div.notice.full div.log{display: block}div.onrowvisible{visibility: hidden;display: inline}a:link,a:visited{font-weight: normal;text-decoration: none}a:active,a:hover{font-weight: normal;text-decoration: none}img[align=left],img[align=right]{padding-right: 1px;padding-left: 1px}div.logo h2{font-weight: normal;font-size: 24px}div.logo p{font-size: 13px}label,.clickable{cursor: pointer}.or-droppable--active{background-color: #2E8B57 !important;cursor: move}.or-droppable--hover{background-color: #00d95a !important;cursor: move}img.icon{padding: 4px;width: 16px;height: 16px}div.panel ul.views li{vertical-align: middle;padding: 0px;cursor: pointer;border-right: 1px solid #000;-moz-border-radius-topleft: 5px;-webkit-border-radius-topleft: 5px;-khtml-border-top-radius-topleft: 5px;-moz-border-radius-topright: 5px;-webkit-border-radius-topright: 5px;-khtml-border-top-radius-topright: 5px;border-top-right-radius: 5px;display: inline;white-space: nowrap;float: left}div.panel{margin: 0px;padding: 0px}div.panel div.status{padding: 10px}div.panel div.status div.error,div.message.error{background: url(../images/notice_error.png) no-repeat;background-position: 5px 7px}div.panel div.status div.warn,div.message.warn{background: url(../images/notice_warning.png) no-repeat;background-position: 5px 7px}div.panel div.status div.ok,div.message.ok{background: url(../images/notice_ok.png) no-repeat;background-position: 5px 7px}div.panel div.status div.info,div.message.info{background: url(../images/notice_info.png) no-repeat;background-position: 5px 7px}div.panel div.status div,div.message{border: 1px solid #000;padding: 5px 0px 5px 25px;margin: 10px 10px 20px 10px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.panel.fullscreen{display: block;z-index: 109;position: fixed;top: 0;left: 0;background-color: #000;margin: 0px;width: 100% !important;height: 100% !important}#workbench div.panel.fullscreen > div.content{width: 100% !important;height: 100% !important}#workbench div.panel{border: 1px solid #000;margin: 0px;padding: 0px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.container,#workbench div.panel,#workbench div.divider{display: inline;float: left;margin: 0px}#workbench div.panel > div.content{overflow: auto}.invisible{visibility: hidden}.visible{visibility: visible}div.panel{position: relative}div.content div.bottom{height: 55px;width: 100%;position: absolute;padding-right: 40px;bottom: 0px;right: 0px;xvisibility: hidden}div.content div.bottom > div.command{xvisibility: visible;float: right;z-index: 20}div.content form[data-autosave='true'] div.command{display: none}div.content > form{padding-bottom: 45px}main .or-form .or-form-actionbar{display: none}.or-form{display: flex;height: 100%;flex-direction: column;padding: 1em}.or-form .or-form-headline{height: 2em}.or-form .or-form-content{flex-grow: 1;overflow-y: auto}.or-form .or-form-actionbar{height: 3em}.or-form input[type=checkbox] + label,.or-form input[type=radio] + label{width: 80%}.or-form .headline{font-size: 1.8em}.or-form div.inputholder > div.dropdown{width: 70%}.or-form input.submit{padding: 7px;border: 0px;-moz-border-radius: 7px;-webkit-border-radius: 7px;-khtml-border-radius: 7px;border-radius: 7px;margin-left: 20px;cursor: pointer}.or-form input[type=text],.or-form select,.or-form textarea{width: 100%;padding: 12px;border: 1px solid #ccc;border-radius: 4px;box-sizing: border-box;resize: vertical}.or-form label{padding: 12px 12px 12px 0;display: inline-block}.or-form input[type=submit]{color: white;padding: 12px 20px;border: none;border-radius: 4px;cursor: pointer;float: right}.or-form div.label{float: left;width: 25%;margin-top: 6px}.or-form div.input{float: left;width: 75%;margin-top: 6px}.or-form .line:after{content: "";display: table;clear: both}.or-form .or-form-row{display: flex;align-items: center}.or-form .or-form-row .or-form-label{width: 25%}.or-form .or-form-row .or-form-input{width: 75%}.or-form .or-form-actionbar{position: sticky;bottom: 0;left: 0;right: 0;display: flex;justify-content: end;padding: 1em;height: auto}.or-form .or-form-actionbar .or-form-btn{padding: 1em 2em;margin-left: 1.5em;min-width: 14em;border: 0;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em;cursor: pointer}.or-form .or-form-actionbar .or-form-btn--primary{font-weight: bold}@media screen and (max-width: 65rem){.or-form div.label,.or-form div.input{width: 100%;margin-top: 0}.or-form .or-form-row{flex-direction: column}.or-form .or-form-row .or-form-label,.or-form .or-form-row .or-form-input{width: 100%}.or-form .or-form-actionbar{align-items: center;display: block}.or-form .or-form-actionbar .or-form-btn{width: 90%}}.or-link-btn{padding: .5em 1em;min-width: 5em;border: 0;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;cursor: pointer}div.search > .or-input{padding-top: 1px}.or-input{padding: 2px;margin: 0px}fieldset > div input.name,fieldset > div span.name{font-weight: bold}fieldset > div input.filename,fieldset > div input.extension,fieldset > div input.ansidate,fieldset > div span.filename,fieldset > div span.extension,fieldset > div span.ansidate{font-family: 'Source Code Pro', Monospace, Monospaced, Courier}dl.notice{padding: 15px}div.content pre,div.dropdown{min-width: 150px;max-width: 450px}img.image-icon{visibility: hidden}.CodeMirror{height: auto}.or-linklist{display: flex;flex-direction: column;padding: 10% 20%}.or-linklist > .or-linklist-line{border: 1px solid;margin-top: 1em;padding: 1em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}.or-info{position: relative}.or-info:hover .or-info-popup{display: block}.or-info .or-info-popup{display: none;position: absolute;top: 0px;left: 0px;overflow: visible;border: 0.5em;font-size: 2em;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;padding: 1.0em;z-index: 105}.or-info .or-info-popup > div{display: inline-block} +#title{overflow: hidden;padding: 5px}.or-menu{display: flex;justify-content: space-between}.or-menu .or-menu-group{display: flex}.or-menu .or-menu-group:nth-last-child(1) div.dropdown{right: 10px}.or-menu .or-menu-group i.image-icon{width: 1.1em}.or-menu .or-menu-group div > div.arrow-down{width: 0;height: 0;margin: 6px;padding: 0px;margin-top: 10px}.or-menu .or-menu-group div.toolbar-icon{padding: 2px;margin-left: 10px;float: left}.or-menu .or-menu-group div.toolbar-icon.user,.or-menu .or-menu-group div.toolbar-icon.search,.or-menu .or-menu-group div.toolbar-icon.history{float: right;margin-right: 10px;margin-left: 10px}.or-menu .or-menu-group div.toolbar-icon.menu{cursor: default}.or-menu .or-menu-group div.toolbar-icon.search input{border: 0;margin: 0;padding: 0;width: 3em;display: inline;transition: width .3s ease-in-out}.or-menu .or-menu-group div.toolbar-icon.search input:focus{width: 8em}.or-menu .or-menu-group div.toolbar-icon div.dropdown{z-index: 120;min-width: 250px;display: none;position: absolute;padding: 5px 0px;font-style: normal;font-weight: normal;text-decoration: none}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry{padding: 0}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a{display: flex;align-items: center;padding: 0 .5em}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a *{margin: 0.25em}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a span:first-of-type{flex: 1}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > .text{display: block;margin: 10px}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.divide{height: 1px;width: 100%;margin-top: 5px;margin-bottom: 5px}.or-menu.open .toolbar-icon.open > div.dropdown{display: block} #navigation ul.or-navtree-list{list-style-type: none;margin: 0;padding: 0}#navigation ul.or-navtree-list ul{margin-left: 18px}#navigation ul.or-navtree-list .or-navtree-node-control{width: 18px;min-width: 18px;height: 18px;float: left;cursor: pointer}#navigation ul.or-navtree-list .or-navtree-node{margin: 0;padding: 0;line-height: 18px;font-weight: normal;white-space: nowrap}#navigation ul.or-navtree-list .or-navtree-node.or-navtree-node--selected{font-weight: bold}#navigation ul.or-navtree-list .or-navtree-node.or-navtree-node--selected > div > a{font-weight: bold} div#dialog > .view{overflow: auto;position: absolute;top: 5%;left: 10%;width: 80%;height: 80%;z-index: 110;border: 1px solid !important}@media only screen and (max-width: 55rem){div#dialog > .view{top: 2.5%;left: 2.5%;width: 95%;height: 95%}}div#dialog.is-closed{display: none;width: 0}div#dialog .filler{position: absolute;z-index: 100;top: 0;left: 0;height: 100%;width: 100%;opacity: 0.5}div#dialog .filler span.icon{opacity: 1;font-size: 3em;font-weight: bold;text-align: center;width: 40px;height: 40px;position: absolute;right: 20px;top: 20px}.arrow{width: 0;height: 0;margin: 6px;padding: 0;font-size: 0}.arrow.arrow-down{border-right: 6px solid transparent;border-top: 6px solid;border-left: 6px solid transparent;border-bottom: 4px solid transparent;margin-top: 10px}.arrow.arrow-right{border-top: 6px solid transparent;border-left: 6px solid;border-bottom: 6px solid transparent;border-right: 4px solid transparent;margin-left: 10px}#editor .dirty{font-weight: bold}.visible-for-nojs{display: none}html.nojs .noscript{display: block}.toggle-open-close{display: flex;flex-direction: column}.toggle-open-close .on-click-open-close{cursor: pointer;font-weight: normal}.toggle-open-close > .closable{transition: opacity .3s ease-out;flex: 1;display: block}.toggle-open-close.closed > .on-click-open-close > .on-closed{display: inline}.toggle-open-close.closed > .on-click-open-close > .on-open{display: none}.toggle-open-close.closed > .closable{opacity: 0;max-height: 0;overflow: hidden}.toggle-open-close.open > .closable{height: auto}.toggle-open-close.open > .on-click-open-close > .on-closed{display: none}.toggle-open-close.open > .on-click-open-close > .on-open{display: inline}html,body{width: 100%;height: 100%}div#workbench{width: 100%;height: 100%;display: flex;flex-direction: column}div#workbench > header{height: 3.0rem}div#workbench > header .toolbar-icon .arrow-down{display: inline}@media only screen and (max-width: 55rem){div#workbench > header .toolbar-icon span.label,div#workbench > header .toolbar-icon .arrow-down{display: none}}div#workbench > .or-main-area{flex: 1;min-height: 0;padding-top: 0.5em}div#workbench > .or-main-area > *{min-width: 0;min-height: 0;overflow-y: auto;overflow-x: hidden;height: 100%}div#workbench > .or-main-area > nav{width: 33%;transition: width .15s ease-in-out;position: fixed;height: calc(100% - 3.0rem - 0.5em)}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > nav{width: 0}}div#workbench > .or-main-area > nav.small{width: 5%;opacity: 0.5;overflow-y: hidden}div#workbench > .or-main-area > nav.small:hover{width: 33%;overflow-y: auto;opacity: 1;background-color: inherit;border-right: 1px solid inherit}div#workbench > .or-main-area > nav.small ~ .or-workplace{margin-left: 5%}div#workbench > .or-main-area > nav.open{overflow-y: auto}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > nav.open{width: 95%;border-right: 1px solid;opacity: 0.95}}@media only screen and (min-width: 75rem){div#workbench > .or-main-area > nav{width: 33%;overflow-y: auto}}div#workbench > .or-main-area > nav div.view{height: 100%}div#workbench > .or-main-area header .or-view-icon,div#workbench > .or-main-area header .or-view-headline{margin: 0.3em;display: inline;font-size: 1.2em;line-height: 1.5em}div#workbench > .or-main-area > .or-workplace{margin-left: 33%;transition: margin-left .15s ease-in-out}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > .or-workplace{margin-left: 0}}div#workbench > .or-main-area > .or-workplace > #editor{transition: opacity .5s ease;display: flex;flex-direction: column}div#workbench > .or-main-area > .or-workplace > #editor.is-closed{flex: 0.5;cursor: not-allowed;pointer-events: none}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > .or-workplace > #editor.is-closed{flex: 0}}div#workbench > .or-main-area > .or-workplace > #editor > section{margin: 1.5em;border: 1px solid;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > .or-workplace > #editor > section{margin: 0.5em}}div#workbench > .or-main-area > .or-workplace > #editor > section .view-toolbar{display: inline}div#workbench > .or-main-area > .or-workplace > #editor > section.closed .view-toolbar{display: none}#title .toggle-nav-small{display: inline}@media only screen and (max-width: 55rem){#title .toggle-nav-small{display: none}}#title .toggle-nav-open-close{display: none}@media only screen and (max-width: 55rem){#title .toggle-nav-open-close{display: inline}}@media only screen and (max-width: 55rem){#title .toolbar-icon.search input{width: 3em}}.loader{background: url(../images/loader.gif) no-repeat;background-position: center, top;height: 30px;opacity: 0.5;cursor: wait;pointer-events: none}@media only screen and (max-width: 55rem){html{font-size: 1em}}.toggle-nav-small,.or-navigation{z-index: 102}.toggle-nav-small:hover,.or-navigation:hover{z-index: 112}.or-breadcrumb{margin-bottom: 0.1em;margin-left: 1.5em;line-height: 18px;font-weight: normal;white-space: nowrap}.or-breadcrumb *{display: inline;margin-right: 0.3em}.or-breadcrumb .or-breadcrumb-item .image-icon{margin-right: 0.2em} .editor__text-editor{width: 100%;height: 300px}textarea.editor__code-editor{display: none}div.editor__code-editor{position: absolute;height: 500px;width: 100%;font-size: 14px;z-index: 256}textarea.editor__text-editor,textarea.editor__wiki-editor,textarea.editor__html-editor{width: 100%}a.editorlink:active,a.editorlink:hover{font-weight: normal;text-decoration: none}a.editorlink:link,a.editorlink:visited{font-weight: normal;text-decoration: none} diff --git a/modules/cms/ui/themes/default/style/theme/openrat-theme.less b/modules/cms/ui/themes/default/style/theme/openrat-theme.less @@ -285,7 +285,7 @@ html.theme-@{cms-theme-id} { } form { - div.inputholder, textarea { + input, select, textarea { background-color: @cms-title-background-color; color: @cms-title-text-color; border: 1px solid mix(@cms-title-text-color, @cms-title-background-color); @@ -295,34 +295,25 @@ html.theme-@{cms-theme-id} { } .or-table-filter { - input { + inputx { background-color: inherit; color: inherit; border-color: mix(@cms-text-color, @cms-background-color); } } - input[type='checkbox'], - input[type='radio'] { + .or-input { background-color: @cms-title-background-color; .border-radius(3px); - } - - div.inputholder > input, div.inputholder > textarea, div.inputholder > select { - border: 0px; border-bottom: 1px solid @cms-text-color; } - input:focus, textarea:focus, select:focus { - border: 0px; - border-bottom: 1px solid @cms-inactive-background-color; + .or-input:focus { + border-color: @cms-title-text-color; } - input.error, textarea.error, select.error { + .or-input.error { border-bottom: 1px dotted @cms-text-color ! important; - } - - div.inputholder.error { border: 1px solid red ! important; } diff --git a/modules/template_engine/components/html/hidden/Hidden.class.php b/modules/template_engine/components/html/hidden/Hidden.class.php @@ -21,8 +21,6 @@ class HiddenComponent extends FieldComponent else $input->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); - //$input->addWrapper( (new HtmlElement('div'))->addStyleClass('inputholder')); - return $input; } } \ No newline at end of file diff --git a/modules/template_engine/components/html/input/Input.class.php b/modules/template_engine/components/html/input/Input.class.php @@ -73,10 +73,7 @@ class InputComponent extends FieldComponent else $input->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); - // Unused: - //if(isset($this->icon)) - // echo '<img src="'.OR_THEMES_DIR.'default/images/icon_'.$this->htmlvalue($this->icon). IMG_ICON_EXT .'" width="16" height="16" />'; - + $input->addStyleClass('or-input'); if ( $this->label ) { $label = new CMSElement('label'); @@ -86,6 +83,6 @@ class InputComponent extends FieldComponent return $label; } - return (new HtmlElement('div'))->addStyleClass('inputholder')->addChild($input); + return $input; } } \ No newline at end of file diff --git a/modules/template_engine/components/html/password/Password.class.php b/modules/template_engine/components/html/password/Password.class.php @@ -35,6 +35,6 @@ class PasswordComponent extends FieldComponent else $input->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); - return (new HtmlElement('div'))->addStyleClass('inputholder')->addChild($input); + return $input->addStyleClass('or-input'); } } \ No newline at end of file diff --git a/modules/template_engine/components/html/selectbox/Selectbox.class.php b/modules/template_engine/components/html/selectbox/Selectbox.class.php @@ -98,6 +98,8 @@ class SelectboxComponent extends Component $optionLoop->addChild($option); + $selectbox->addStyleClass('or-input'); + // Wrap into a label, if necessary. if ( $this->label ) { $label = new CMSElement('label'); diff --git a/modules/template_engine/components/html/table/Table.class.php b/modules/template_engine/components/html/table/Table.class.php @@ -21,7 +21,7 @@ class TableComponent extends HtmlComponent if ( $this->filter) { - $filterInput = (new CMSElement('input'))->addAttribute('type','search')->addAttribute('name','filter')->addAttribute('placeholder',Value::createExpression(ValueExpression::TYPE_MESSAGE,'SEARCH_FILTER')); + $filterInput = (new CMSElement('input'))->addStyleClass('or-input')->addAttribute('type','search')->addAttribute('name','filter')->addAttribute('placeholder',Value::createExpression(ValueExpression::TYPE_MESSAGE,'SEARCH_FILTER')); $filter = (new HtmlElement('div'))->addStyleClass('or-table-filter')->addChild( $filterInput ); $tableWrapper->addChild($filter); } diff --git a/modules/template_engine/components/html/upload/upload.js b/modules/template_engine/components/html/upload/upload.js @@ -80,7 +80,7 @@ Openrat.Workbench.handleFileUpload = function(form,files) msg = jqXHR.responseText; } - Openrat.Workbench.notify('Upload error',msg); + Openrat.Workbench.notify('Upload error', 0, msg); } } );