commit 7227d8e3dad720caa2c06cb665d260809c775bae parent c37a74d4596cf980dea6c6b51cbdad214b76a993 Author: Jan Dankert <develop@jandankert.de> Date: Tue, 28 May 2019 00:30:34 +0200 Refactoring: Datum mit dem nativen Browser-Eingabefeld eingeben, das dürfte für fast alle Belange das beste sein. Diffstat:
16 files changed, 290 insertions(+), 684 deletions(-)
diff --git a/modules/cms-core/action/ElementAction.class.php b/modules/cms-core/action/ElementAction.class.php @@ -302,7 +302,7 @@ class ElementAction extends Action //$ini_date_format = config('date','format'); //$ini_date_format = Conf()->subset('date')->get('format'); - $ini_date_format = config()['date']['format']; + $ini_date_format = config()->subset('date')->get('format'); $dateformat = array(); $this->setTemplateVar('dateformat',''); diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php @@ -375,187 +375,9 @@ class PageelementAction extends Action */ private function editdate() { - global $conf; - $date = $this->value->date; - - // Wenn Datum nicht vorhanden... - if ( $date == 0 ) - // ... dann aktuelles Datum (gerundet auf 1 Minute) verwenden - $date = intval(time()/60)*60; - - $this->setTemplateVar('ansidate',date( 'Y-m-d H:i:s',$date ) ); - $this->setTemplateVar('date' ,$date); - - if ( $this->getSessionVar('pageaction') != '' ) - $this->setTemplateVar('old_pageaction',$this->getSessionVar('pageaction')); - else $this->setTemplateVar('old_pageaction','show' ); - - - // Wenn Datum nicht vorhanden, dann aktuelles Datum verwenden - if ( $this->hasRequestVar('year') ) - { - $date = mktime( $this->getRequestVar('hour'), - $this->getRequestVar('minute'), - $this->getRequestVar('second'), - $this->getRequestVar('month'), - $this->getRequestVar('day'), - $this->getRequestVar('year') ); - } - $year = intval(date('Y',$date)); - $month = intval(date('n',$date)); - $day = intval(date('j',$date)); - $hour = intval(date('G',$date)); - $minute = intval(date('i',$date)); - $second = intval(date('s',$date)); - $this->setTemplateVar('year' ,$year ); - $this->setTemplateVar('month' ,$month ); - $this->setTemplateVar('day' ,$day ); - $this->setTemplateVar('hour' ,$hour ); - $this->setTemplateVar('minute',$minute ); - $this->setTemplateVar('second',$second ); - - $this->setTemplateVar('monthname',lang('DATE_MONTH'.date('n',$date)) ); - $this->setTemplateVar('yearname' ,date('Y',$date) ); - - - // Zwischenberechnungen - $heuteTag = intval(date('j')); - $monatLetzterTag = intval(date('t',$date)); - $monatErsterDatum = $date-(($day-1)*86400); - $wocheNr = date( 'W',$monatErsterDatum ); - $wochentagErster = date( 'w',$monatErsterDatum ); - - - $weekdayOffset = intval($conf['editor']['calendar']['weekday_offset']); - - // Alle Wochentage - $weekdays = array(); - for ( $i=0; $i<=6; $i++ ) - { - $wday = ($i+$weekdayOffset)%7; - $weekdays[$wday] = lang('DATE_WEEKDAY'.$wday); - } - - $this->setTemplateVar('weekdays',$weekdays); - - - $monat = array(); - $d = 0; - $begin = false; - do - { - $woche = array(); // Neue Woche - - for ( $i=0; $i<=6; $i++ ) // Alle Wochentage der Woche - { - $wday = ($i+$weekdayOffset)%7; - $tag = array(); // Neuer Tag - - if (!$begin && $wday == $wochentagErster) - $begin = true; - - if ( $begin && $d < $monatLetzterTag ) - { - $d++; - $tag['nr'] = $d; - $tag['today'] = ($year==date('Y') && $month==date('n') && $d==$heuteTag); - if ($d != $day) - $tag['url'] = Html::url( 'pageelement','edit','', - array('elementid'=>$this->element->elementid,'mode'=>'edit', - 'year' =>$year , - 'month' =>$month , - 'day' =>$d , - 'hour' =>$hour , - 'minute'=>$minute, - 'second'=>$second ) ); - else - $tag['url'] = ''; - } - else - { - $tag['nr' ]=''; - $tag['today' ]=false; - $tag['url' ]=''; - } - $woche[] = $tag; - - } - $monat[$wocheNr] = $woche; - $wocheNr++; - } - while( $d < $monatLetzterTag-1 ); - // Html::debug($monat); - $this->setTemplateVar('weeklist',$monat); - - $this->setTemplateVar('actdate' ,date( lang('DATE_FORMAT'),$date ) ); - $this->setTemplateVar('todayurl',Html::url( 'pageelement','edit','', - array('elementid'=>$this->element->elementid,'mode'=>'edit', - 'year' =>date('Y'), - 'month' =>date('n'), - 'day' =>date('j'), - 'hour' =>date('G'), - 'minute'=>date('i'), - 'second'=>date('s') ) ) ); - $this->setTemplateVar('lastyearurl',Html::url( 'pageelement','edit','', - array('elementid'=>$this->element->elementid,'mode'=>'edit', - 'year' =>$year-1, - 'month' =>$month , - 'day' =>$day , - 'hour' =>$hour , - 'minute'=>$minute, - 'second'=>$second ) ) ); - $this->setTemplateVar('nextyearurl',Html::url( 'pageelement','edit','', - array('elementid'=>$this->element->elementid,'mode'=>'edit', - 'year' =>$year+1 , - 'month' =>$month , - 'day' =>$day , - 'hour' =>$hour , - 'minute'=>$minute, - 'second'=>$second ) ) ); - $this->setTemplateVar('lastmonthurl',Html::url( 'pageelement','edit','', - array('elementid'=>$this->element->elementid,'mode'=>'edit', - 'year' =>$year , - 'month' =>$month-1, - 'day' =>$day , - 'hour' =>$hour , - 'minute'=>$minute, - 'second'=>$second ) ) ); - $this->setTemplateVar('nextmonthurl',Html::url( 'pageelement','edit','', - array('elementid'=>$this->element->elementid,'mode'=>'edit', - 'year' =>$year , - 'month' =>$month+1, - 'day' =>$day , - 'hour' =>$hour , - 'minute'=>$minute, - 'second'=>$second ) ) ); - - // $this->setTemplateVar('date' ,$date); - - - - if ( $this->getSessionVar('pageaction') != '' ) - $this->setTemplateVar('old_pageaction',$this->getSessionVar('pageaction')); - else $this->setTemplateVar('old_pageaction','show' ); - - - $all_years = array(); - $all_months = array(); - $all_days = array(); - $all_hours = array(); - $all_minutes = array(); - for( $i=$year-100; $i<=$year+100;$i++ ) $all_years [$i] = $i; - for( $i=1; $i<=12; $i++ ) $all_months [$i] = lang('DATE_MONTH'.$i); - for( $i=1; $i<=31; $i++ ) $all_days [$i] = str_pad($i,2,'0',STR_PAD_LEFT); - for( $i=0; $i<=23; $i++ ) $all_hours [$i] = str_pad($i,2,'0',STR_PAD_LEFT); - for( $i=0; $i<=59; $i++ ) $all_minutes[$i] = str_pad($i,2,'0',STR_PAD_LEFT); - - $this->setTemplateVar('all_years' ,$all_years ); - $this->setTemplateVar('all_months' ,$all_months ); - $this->setTemplateVar('all_days' ,$all_days ); - $this->setTemplateVar('all_hours' ,$all_hours ); - $this->setTemplateVar('all_minutes',$all_minutes); - $this->setTemplateVar('all_seconds',$all_minutes); - } + $this->setTemplateVar( 'date' ,$this->value->date==null?'':date('Y-m-d',$this->value->date) ); + $this->setTemplateVar( 'time' ,$this->value->date==null?'':date('H:i' ,$this->value->date) ); + } @@ -1129,7 +951,6 @@ class PageelementAction extends Action */ private function savelongtext() { - global $conf; $value = new Value(); $value->languageid = $this->page->languageid; $value->objectid = $this->page->objectid; @@ -1199,6 +1020,7 @@ class PageelementAction extends Action $value->languageid = $this->page->languageid; $value->objectid = $this->page->objectid; $value->pageid = Page::getPageIdFromObjectId( $this->page->objectid ); + $value->publisher = $this->page->publisher; if ( !$this->hasRequestVar('elementid') ) throw new ValidationException('elementid'); @@ -1209,20 +1031,10 @@ class PageelementAction extends Action if ( $this->hasRequestVar('linkobjectid') ) $value->linkToObjectId = $this->getRequestVar('linkobjectid'); - elseif ( $this->hasRequestVar('date') ) - // Wenn ein Timestamp übergeben wurde, dann dieses verwenden - $value->date = $this->getRequestVar('date'); - elseif ( $this->getRequestVar('ansidate') != $this->getRequestVar('ansidate_orig') ) - // Wenn ein ANSI-Datum eingegeben wurde, dann dieses verwenden - $value->date = strtotime($this->getRequestVar('ansidate') ); - else - // Sonst die Zeitwerte einzeln zu einem Datum zusammensetzen - $value->date = mktime( $this->getRequestVar('hour' ), - $this->getRequestVar('minute'), - $this->getRequestVar('second'), - $this->getRequestVar('month' ), - $this->getRequestVar('day' ), - $this->getRequestVar('year' ) ); + else { + $value->date = strtotime( $this->getRequestVar( 'date' ).' '.$this->getRequestVar( 'time' ) ); + + } $this->afterSave($value); } @@ -1240,6 +1052,7 @@ class PageelementAction extends Action $value->languageid = $this->page->languageid; $value->objectid = $this->page->objectid; $value->pageid = Page::getPageIdFromObjectId( $this->page->objectid ); + $value->publisher = $this->page->publisher; if ( !$this->hasRequestVar('elementid') ) throw new ValidationException('elementid'); @@ -1332,6 +1145,7 @@ class PageelementAction extends Action private function savenumber() { $value = new Value(); + $value->publisher = $this->page->publisher; $value->languageid = $this->page->languageid; $value->objectid = $this->page->objectid; $value->pageid = Page::getPageIdFromObjectId( $this->page->objectid ); diff --git a/modules/cms-ui/themes/default/html/views/pageelement/value.php b/modules/cms-ui/themes/default/html/views/pageelement/value.php @@ -1,7 +1,5 @@ - - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> @@ -9,358 +7,240 @@ <input type="hidden" name="value_time" value="<?php echo $value_time ?>"/> + <span class="help"><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> + <?php $if3=($type=='date'); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('date') ?></legend><div class="closable"> + <div class="line"> + <label class="or-form-row"><span class="or-form-label"><?php echo lang('date') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_date" name="<?php if ('') echo ''.'_' ?>date<?php if ('') echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$date) ?>" /><?php if ('') { ?><input type="hidden" name="date" value="<?php $date ?>"/><?php } ?></div></span></label> + + <label class="or-form-row"><span class="or-form-label"><?php echo lang('time') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_time" name="<?php if ('') echo ''.'_' ?>time<?php if ('') echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$time) ?>" /><?php if ('') { ?><input type="hidden" name="time" value="<?php $time ?>"/><?php } ?></div></span></label> + + </div> + </div></fieldset> + <?php } ?> + <?php $if3=($type=='text'); if($if3){?> + <tr> + <td colspan="2"> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_text" name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="text" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if ('') { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> + + </td> + </tr> + <?php } ?> + <?php $if3=($type=='longtext'); if($if3){?> + <input type="hidden" name="format" value="<?php echo $format ?>"/> - <?php $if4=($type=='date'); if($if4){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('calendar') ?></legend><div class="closable"> - <div> - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table class="calendar" width="85%"></div> - <tr> - <td colspan="8" class="help"> - <a target="_self" data-url="<?php echo $lastmonthurl ?>" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img src="./modules/cms-ui/themes/default/images/icon/left.png" /> - - </a> - - <span><?php echo nl2br(' '); ?></span> - - <strong><?php echo nl2br(encodeHtml(htmlentities($monthname))); ?></strong> - - <span><?php echo nl2br(' '); ?></span> - - <a target="_self" data-url="<?php echo $nextmonthurl ?>" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img src="./modules/cms-ui/themes/default/images/icon/right.png" /> - - </a> - - <span><?php echo nl2br(' '); ?></span> - - <a target="_self" data-url="<?php echo $lastyearurl ?>" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img src="./modules/cms-ui/themes/default/images/icon/left.png" /> - - </a> - - <span><?php echo nl2br(' '); ?></span> - - <strong><?php echo nl2br(encodeHtml(htmlentities($yearname))); ?></strong> - - <span><?php echo nl2br(' '); ?></span> - - <a target="_self" data-url="<?php echo $nextyearurl ?>" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img src="./modules/cms-ui/themes/default/images/icon/right.png" /> - - </a> - - </td> - </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'week'.'')))); ?></span> - - </td> - <?php foreach($weekdays as $list_key=>$weekday){ ?> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($weekday))); ?></span> - - </td> - <?php } ?> - </tr> - <?php foreach($weeklist as $weeknr=>$week){ ?> - <tr> - <td width="12%"> - <span><?php echo nl2br(encodeHtml(htmlentities($weeknr))); ?></span> - - </td> - <?php foreach($week as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <td width="12%"> - <?php $if12=(($url)==FALSE); if($if12){?> - <span><?php echo nl2br(' '); ?></span> - - <strong><?php echo nl2br(encodeHtml(htmlentities($nr))); ?></strong> - - <span><?php echo nl2br(' '); ?></span> - - <?php } ?> - <?php $if12=!(($url)==FALSE); if($if12){?> - <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <span><?php echo nl2br(' '); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities($nr))); ?></span> - - <span><?php echo nl2br(' '); ?></span> - - </a> - - <?php } ?> - <?php $if12=($today); if($if12){?> - <span><?php echo nl2br('*'); ?></span> - - <?php } ?> - </td> - <?php } ?> - </tr> - <?php } ?> - </table> - </div> - </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('date') ?></legend><div class="closable"> - <div> - <label for="<?php echo REQUEST_ID ?>_year" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'date'.'')))); ?></span> - - </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_year" name="year" title="" class=""<?php if (count($all_years)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_years,$year,0,0) ?><?php if (count($all_years)==0) { ?><input type="hidden" name="year" value="" /><?php } ?><?php if (count($all_years)==1) { ?><input type="hidden" name="year" value="<?php echo array_keys($all_years)[0] ?>" /><?php } ?> - </select></div> - <span><?php echo nl2br(' - '); ?></span> + <?php $if4=(isset($preview)); if($if4){?> + <div class="preview"> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('page_preview') ?></legend><div class="closable"> + <span><?php echo nl2br($preview); ?></span> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_month" name="month" title="" class=""<?php if (count($all_months)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_months,$month,0,0) ?><?php if (count($all_months)==0) { ?><input type="hidden" name="month" value="" /><?php } ?><?php if (count($all_months)==1) { ?><input type="hidden" name="month" value="<?php echo array_keys($all_months)[0] ?>" /><?php } ?> - </select></div> - <span><?php echo nl2br(' - '); ?></span> - - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_day" name="day" title="" class=""<?php if (count($all_days)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_days,$day,0,0) ?><?php if (count($all_days)==0) { ?><input type="hidden" name="day" value="" /><?php } ?><?php if (count($all_days)==1) { ?><input type="hidden" name="day" value="<?php echo array_keys($all_days)[0] ?>" /><?php } ?> - </select></div> - </div> - <div> - <label for="<?php echo REQUEST_ID ?>_hour" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'date_time'.'')))); ?></span> - - </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_hour" name="hour" title="" class=""<?php if (count($all_hours)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_hours,$hour,0,0) ?><?php if (count($all_hours)==0) { ?><input type="hidden" name="hour" value="" /><?php } ?><?php if (count($all_hours)==1) { ?><input type="hidden" name="hour" value="<?php echo array_keys($all_hours)[0] ?>" /><?php } ?> - </select></div> - <span><?php echo nl2br(' - '); ?></span> - - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_minute" name="minute" title="" class=""<?php if (count($all_minutes)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_minutes,$minute,0,0) ?><?php if (count($all_minutes)==0) { ?><input type="hidden" name="minute" value="" /><?php } ?><?php if (count($all_minutes)==1) { ?><input type="hidden" name="minute" value="<?php echo array_keys($all_minutes)[0] ?>" /><?php } ?> - </select></div> - <span><?php echo nl2br(' - '); ?></span> - - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_second" name="second" title="" class=""<?php if (count($all_seconds)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_seconds,$second,0,0) ?><?php if (count($all_seconds)==0) { ?><input type="hidden" name="second" value="" /><?php } ?><?php if (count($all_seconds)==1) { ?><input type="hidden" name="second" value="<?php echo array_keys($all_seconds)[0] ?>" /><?php } ?> - </select></div> - </div> - </div></fieldset> + </div></fieldset> + </div> <?php } ?> - <?php $if4=($type=='text'); if($if4){?> - <tr> - <td colspan="2"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_text" name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="text" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if ('') { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> - - </td> - </tr> + <?php $if4=($editor=='markdown'); if($if4){?> + <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor markdown-editor"><?php echo htmlentities(${'text'}) ?></textarea> + <?php } ?> - <?php $if4=($type=='longtext'); if($if4){?> - <input type="hidden" name="format" value="<?php echo $format ?>"/> + <?php $if4=($editor=='html'); if($if4){?> + <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor html-editor" id="pageelement_edit_editor"><?php echo ${'text'} ?></textarea> - <?php $if5=(isset($preview)); if($if5){?> - <div class="preview"> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('page_preview') ?></legend><div class="closable"> - <span><?php echo nl2br($preview); ?></span> - - </div></fieldset> - </div> - <?php } ?> - <?php $if5=($editor=='markdown'); if($if5){?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor markdown-editor"><?php echo htmlentities(${'text'}) ?></textarea> - - <?php } ?> - <?php $if5=($editor=='html'); if($if5){?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor html-editor" id="pageelement_edit_editor"><?php echo ${'text'} ?></textarea> - - <?php } ?> - <?php $if5=($editor=='wiki'); if($if5){?> - <?php $if6=(isset($languagetext)); if($if6){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $languagename ?></legend><div class="closable"> - <span><?php echo nl2br(encodeHtml(htmlentities($languagetext))); ?></span> - - </div></fieldset> - <br/> - - <br/> + <?php } ?> + <?php $if4=($editor=='wiki'); if($if4){?> + <?php $if5=(isset($languagetext)); if($if5){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $languagename ?></legend><div class="closable"> + <span><?php echo nl2br(encodeHtml(htmlentities($languagetext))); ?></span> - <?php } ?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor wiki-editor"><?php echo ${'text'} ?></textarea> - - <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('help') ?></legend><div class="closable"> - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-begin')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_strong'.'')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-end')))); ?></span> - - <br/> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-begin')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_emphatic'.'')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-end')))); ?></span> - - </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_numbered_list'.'')))); ?></span> - - <br/> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <br/> - - </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_unnumbered_list'.'')))); ?></span> - - <br/> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <br/> - - </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_table'.'')))); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <br/> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <span><?php echo nl2br('...'); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - - <br/> - - </td> - </table> </div></fieldset> - <?php } ?> - <?php $if5=($editor=='text'); if($if5){?> - <div class="inputholder"><textarea class="editor raw-editor" name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($text) ?></textarea></div> - + <br/> + <br/> <?php } ?> + <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor wiki-editor"><?php echo ${'text'} ?></textarea> + + <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('help') ?></legend><div class="closable"> + <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-begin')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_strong'.'')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-end')))); ?></span> + + <br/> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-begin')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_emphatic'.'')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-end')))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_numbered_list'.'')))); ?></span> + + <br/> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <br/> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_unnumbered_list'.'')))); ?></span> + + <br/> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <br/> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_table'.'')))); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <br/> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <span><?php echo nl2br('...'); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> + + <br/> + + </td> + </table></div></div> + </div></fieldset> <?php } ?> - <?php $if4=($type=='link'); if($if4){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_linkobjectid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_target'.'')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="selector"> + <?php $if4=($editor=='text'); if($if4){?> + <div class="inputholder"><textarea class="editor raw-editor" name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($text) ?></textarea></div> + + + + <?php } ?> + <?php } ?> + <?php $if3=($type=='link'); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_linkobjectid" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_target'.'')))); ?></span> + + </label> + </div> + <div class="input"> + <div class="selector"> <div class="inputholder or-droppable"> <input type="hidden" class="or-selector-link-value" name="linkobjectid" value="<?php echo $linkobjectid ?>" /> <input type="text" class="or-selector-link-name" disabled="disabled" value="<?php echo $linkobjectid ?>" /> </div> <div class="tree selector" data-types="{types}" data-init-id="<?php echo $linkobjectid ?>" data-init-folderid="<?php echo $rootfolderid ?>"> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_link_url" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_url'.'')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_linkurl" name="<?php if ('') echo ''.'_' ?>linkurl<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$linkurl) ?>" /><?php if ('') { ?><input type="hidden" name="linkurl" value="<?php $linkurl ?>"/><?php } ?></div> - - </div> - </div> - </div></fieldset> - <?php } ?> - <?php $if4=($type=='list'); if($if4){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> - <div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> - </div> - </div></fieldset> - <?php } ?> - <?php $if4=($type=='insert'); if($if4){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> - <div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> - - + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_link_url" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_url'.'')))); ?></span> + + </label> </div> - </div></fieldset> - <?php } ?> - <?php $if4=($type=='number'); if($if4){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> - <div> - <input type="hidden" name="decimals" value="decimals"/> - - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_number" name="<?php if ('') echo ''.'_' ?>number<?php if ('') echo '_disabled' ?>" type="text" maxlength="20" class="" value="<?php echo Text::encodeHtml(@$number) ?>" /><?php if ('') { ?><input type="hidden" name="number" value="<?php $number ?>"/><?php } ?></div> + <div class="input"> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_linkurl" name="<?php if ('') echo ''.'_' ?>linkurl<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$linkurl) ?>" /><?php if ('') { ?><input type="hidden" name="linkurl" value="<?php $linkurl ?>"/><?php } ?></div> </div> - </div></fieldset> - <?php } ?> - <?php $if4=($type=='select'); if($if4){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> - <div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_text" name="text" title="" class=""<?php if (count($items)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($items,$text,0,0) ?><?php if (count($items)==0) { ?><input type="hidden" name="text" value="" /><?php } ?><?php if (count($items)==1) { ?><input type="hidden" name="text" value="<?php echo array_keys($items)[0] ?>" /><?php } ?> - </select></div> - </div> - </div></fieldset> - <?php } ?> - <?php $if4=($type=='longtext'); if($if4){?> - <?php $if5=($editor=='wiki'); if($if5){?> - <?php $if6=(isset($languages)); if($if6){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('editor_show_language') ?></legend><div class="closable"> - <div> - <?php foreach($languages as $languageid=>$languagename){ ?> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_otherlanguageid_<?php echo $languageid ?>" name="otherlanguageid" value="<?php echo $languageid ?>"<?php if($languageid==@$otherlanguageid)echo ' checked="checked"' ?> /> - - <label for="<?php echo REQUEST_ID ?>_<?php echo 'otherlanguageid_'.$languageid.'' ?>" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> - - </label> - <br/> - - <?php } ?> - </div> - </div></fieldset> - <?php } ?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('PAGE_PREVIEW') ?></legend><div class="closable"> + </div> + </div></fieldset> + <?php } ?> + <?php $if3=($type=='list'); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> + <div> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> + </select></div> + + + </div> + </div></fieldset> + <?php } ?> + <?php $if3=($type=='insert'); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> + <div> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> + </select></div> + + + </div> + </div></fieldset> + <?php } ?> + <?php $if3=($type=='number'); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> + <div> + <input type="hidden" name="decimals" value="decimals"/> + + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_number" name="<?php if ('') echo ''.'_' ?>number<?php if ('') echo '_disabled' ?>" type="text" maxlength="20" class="" value="<?php echo Text::encodeHtml(@$number) ?>" /><?php if ('') { ?><input type="hidden" name="number" value="<?php $number ?>"/><?php } ?></div> + + </div> + </div></fieldset> + <?php } ?> + <?php $if3=($type=='select'); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> + <div> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_text" name="text" title="" class=""<?php if (count($items)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($items,$text,0,0) ?><?php if (count($items)==0) { ?><input type="hidden" name="text" value="" /><?php } ?><?php if (count($items)==1) { ?><input type="hidden" name="text" value="<?php echo array_keys($items)[0] ?>" /><?php } ?> + </select></div> + </div> + </div></fieldset> + <?php } ?> + <?php $if3=($type=='longtext'); if($if3){?> + <?php $if4=($editor=='wiki'); if($if4){?> + <?php $if5=(isset($languages)); if($if5){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('editor_show_language') ?></legend><div class="closable"> <div> - <?php { $tmpname = 'preview';$default = '';$readonly = '';$required = ''; + <?php foreach($languages as $languageid=>$languagename){ ?> + <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_otherlanguageid_<?php echo $languageid ?>" name="otherlanguageid" value="<?php echo $languageid ?>"<?php if($languageid==@$otherlanguageid)echo ' checked="checked"' ?> /> + + <label for="<?php echo REQUEST_ID ?>_<?php echo 'otherlanguageid_'.$languageid.'' ?>" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> + + </label> + <br/> + + <?php } ?> + </div> + </div></fieldset> + <?php } ?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('PAGE_PREVIEW') ?></legend><div class="closable"> + <div> + <?php { $tmpname = 'preview';$default = '';$readonly = '';$required = ''; if ( isset($$tmpname) ) $checked = $$tmpname; else @@ -373,19 +253,19 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> + + <label for="<?php echo REQUEST_ID ?>_preview" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PAGE_PREVIEW'.'')))); ?></span> - <label for="<?php echo REQUEST_ID ?>_preview" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PAGE_PREVIEW'.'')))); ?></span> - - </label> - </div> - </div></fieldset> - <?php } ?> + </label> + </div> + </div></fieldset> <?php } ?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $if5=(isset($release)); if($if5){?> - <div> - <?php { $tmpname = 'release';$default = '';$readonly = '';$required = ''; + <?php } ?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <?php $if4=(isset($release)); if($if4){?> + <div> + <?php { $tmpname = 'release';$default = '';$readonly = '';$required = ''; if ( isset($$tmpname) ) $checked = $$tmpname; else @@ -398,16 +278,16 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> + + <label for="<?php echo REQUEST_ID ?>_release" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> - <label for="<?php echo REQUEST_ID ?>_release" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> - - </label> - </div> - <?php } ?> - <?php $if5=(isset($publish)); if($if5){?> - <div> - <?php { $tmpname = 'publish';$default = '';$readonly = '';$required = ''; + </label> + </div> + <?php } ?> + <?php $if4=(isset($publish)); if($if4){?> + <div> + <?php { $tmpname = 'publish';$default = '';$readonly = '';$required = ''; if ( isset($$tmpname) ) $checked = $$tmpname; else @@ -420,14 +300,13 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> + + <label for="<?php echo REQUEST_ID ?>_publish" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> - <label for="<?php echo REQUEST_ID ?>_publish" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> - - </label> - </div> - <?php } ?> - </div></fieldset> - + </label> + </div> + <?php } ?> + </div></fieldset> <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('save') ?>" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/value.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/value.tpl.src.xml @@ -1,99 +1,17 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <header views="link,import,export"></header> - <form method="post" label="message:save" visible="yes"> + <form method="post" label="message:save"> <hidden name="languageid" /> <hidden name="elementid" /> <hidden name="value_time" /> - <window name="element"> <text var="desc" class="help"></text> <if value="var:type" equals="date"> - <group title="message:calendar"> - <part> - <table width="85%" class="calendar"> - <row> - <column colspan="8" class="help"> - <link url="var:lastmonthurl"> - <image file="left" align="middle"></image> - </link> - <text raw="_"></text> - <text var="monthname" type="strong"></text> - <text raw="_"></text> - <link url="var:nextmonthurl"> - <image file="right" align="middle"></image> - </link> - <text raw="_____"></text> - <link url="var:lastyearurl"> - <image file="left" align="middle"></image> - </link> - <text raw="_"></text> - <text var="yearname" type="strong"></text> - <text raw="_"></text> - <link url="var:nextyearurl"> - <image file="right" align="middle"></image> - </link> - </column> - </row> - <row> - <column> - <text key="week"></text> - </column> - <list list="weekdays" value="weekday"> - <column> - <text var="weekday"></text> - </column> - </list> - </row> - <list list="weeklist" key="weeknr" value="week"> - <row> - <column width="12%"> - <text var="weeknr"></text> - </column> - <list list="week" extract="true"> - <column width="12%"> - <if empty="url"> - <text raw="__"></text> - <text var="nr" type="strong"></text> - <text raw="__"></text> - </if> - <if not="true" empty="url"> - <link url="var:url"> - <text raw="__"></text> - <text var="nr"></text> - <text raw="__"></text> - </link> - </if> - <if true="var:today"> - <text raw="*"></text> - </if> - </column> - </list> - </row> - </list> - </table> - </part> - </group> <group title="message:date"> - <part> - <label for="year"> - <text key="date"></text> - </label> - <selectbox name="year" list="all_years"></selectbox> - <text raw="_-_"></text> - <selectbox name="month" list="all_months"></selectbox> - <text raw="_-_"></text> - <selectbox name="day" list="all_days"></selectbox> - </part> - <part> - <label for="hour"> - <text key="date_time"></text> - </label> - <selectbox name="hour" list="all_hours"></selectbox> - <text raw="_-_"></text> - <selectbox name="minute" list="all_minutes"></selectbox> - <text raw="_-_"></text> - <selectbox name="second" list="all_seconds"></selectbox> + <part class="line"> + <input type="date" name="date" label="date" /> + <input type="time" name="time" label="time" /> </part> + </group> </if> <if value="var:type" equals="text"> @@ -286,6 +204,5 @@ </part> </if> </group> - </window> </form> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/extension.php b/modules/cms-ui/themes/default/html/views/template/extension.php @@ -2,12 +2,12 @@ <form name="" target="_self" data-target="view" action="./" data-method="extension" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extension" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> <?php foreach($extension as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $name ?></legend><div> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $name ?></legend><div class="closable"> <?php $$name= $extension; ?> - <label class="or-form-row"><span class="or-form-label">?extension?</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $name ?>" name="<?php if ('') echo ''.'_' ?><?php echo $name ?><?php if ('') echo '_disabled' ?>" required="required" type="text" maxlength="10" class="" value="<?php echo Text::encodeHtml(@$$name) ?>" /><?php if ('') { ?><input type="hidden" name="<?php echo $name ?>" value="<?php $$name ?>"/><?php } ?></div></span></label> + <label class="or-form-row"><span class="or-form-label"><?php echo lang('template_extension') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $name ?>" name="<?php if ('') echo ''.'_' ?><?php echo $name ?><?php if ('') echo '_disabled' ?>" required="required" type="text" maxlength="10" class="" value="<?php echo Text::encodeHtml(@$$name) ?>" /><?php if ('') { ?><input type="hidden" name="<?php echo $name ?>" value="<?php $$name ?>"/><?php } ?></div></span></label> </div></fieldset> <?php } ?> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/extension.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/extension.tpl.src.xml @@ -6,7 +6,7 @@ <group title="var:name"> <set var="var:name" value="var:extension"/> - <input name="var:name" label="extension" required="true" maxlength="10" /> + <input name="var:name" label="template_extension" required="true" maxlength="10"/> </group> </list> diff --git a/modules/cms-ui/themes/default/html/views/title/show.php b/modules/cms-ui/themes/default/html/views/title/show.php @@ -295,7 +295,7 @@ </a> </div> - <div class="entry clickable filtered on-action-element on-action-file on-action-image on-action-text on-action-pageelement"> + <div class="entry clickable filtered on-action-folder on-action-element on-action-file on-action-image on-action-text on-action-pageelement"> <a title="<?php echo lang('menu_advanced_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="advanced" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'advanced'}" href="<?php echo Html::url('','advanced','',array('dialogAction'=>'','dialogMethod'=>'advanced')) ?>"> <i class="image-icon image-icon--method-advanced"></i> diff --git a/modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml @@ -316,7 +316,7 @@ </link> </part> - <part class="entry clickable filtered on-action-element on-action-file on-action-image on-action-text on-action-pageelement"> + <part class="entry clickable filtered on-action-folder on-action-element on-action-file on-action-image on-action-text on-action-pageelement"> <link type="dialog" title="message:menu_advanced_desc" subaction="advanced"> <image method="advanced"></image> diff --git a/modules/language/lang-cn.php b/modules/language/lang-cn.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Is default", 'GLOBAL_KEY'=>"Key", 'GLOBAL_LANGUAGES_DESC'=>"All content can be created in several languages", -'GLOBAL_LANGUAGE'=>"Language", 'GLOBAL_LANGUAGES'=>"Languages", 'GLOBAL_LASTCHANGE'=>"Last Change", 'GLOBAL_LINK_TO'=>"Shortcut to", @@ -1069,8 +1068,8 @@ function language() { return array( 'PROJECT_FTP_PASSIVE'=>"use passive FTP-Transfer", 'PROJECT_FTP_URL_DESC'=>"FTP server, format: <tt>ftp://user:pw@hostname:port/path/.../path/</tt>.<br/>Leave this blank, if you are only generating local.", 'PROJECT_FTP_URL'=>"FTP-Server URL", -'PROJECT_INFO_COUNT_OBJECTS'=>"Objects count", -'PROJECT_INFO_SUM_FILESIZE'=>"Size of all files", +'COUNT_OBJECTS'=>"Objects count", +'SUM_FILESIZE'=>"Size of all files", 'PROJECT_LOCAL_FOLDER_DESC'=>"A Directy in the local filesystem on the server, example: <tt>/home/user/dir</tt>(Unix) or <tt>c:/documents/dir</tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Local directory", 'PROJECT_LOCALPATH_DESC'=>"Local directory, format: <tt>/path/.../path/</tt>.<br/>Leave blank, if you are only publishing via FTP.", @@ -1214,6 +1213,7 @@ function language() { return array( 'EL_LIST'=>"List", 'FILE_IMAGE_NEW_HEIGHT'=>"New height", 'FILE_IMAGE_NEW_WIDTH'=>"New width", +'GLOBAL_LANGUAGE'=>"Language", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"Hint: There are no templates available.", 'GLOBAL_SHOW'=>"Show", 'GLOBAL_TIME'=>"Time", @@ -1281,10 +1281,10 @@ function language() { return array( 'QRCODE_SHOW'=>"Show QR-Code", 'LABEL'=>"Label", 'NAME'=>"Name", -'SOURCE'=>"Source", 'GLOBAL_PUBLISHED'=>"Published", 'SECURITY'=>"Security", 'USER_LAST_LOGIN'=>"Last Logon", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Change password", +'SOURCE'=>"Source", );} \ No newline at end of file diff --git a/modules/language/lang-de.php b/modules/language/lang-de.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Ist Standard", 'GLOBAL_KEY'=>"Taste", 'GLOBAL_LANGUAGES_DESC'=>"Alle Projektinhalte können in verschiedenen Sprachen erzeugt werden", -'GLOBAL_LANGUAGE'=>"Language", 'GLOBAL_LANGUAGES'=>"Sprachen", 'GLOBAL_LASTCHANGE'=>"Letzte Änderung", 'GLOBAL_LINK_TO'=>"Verknüpfung zu", @@ -1069,8 +1068,8 @@ function language() { return array( 'PROJECT_FTP_PASSIVE'=>"Passiven FTP-Transfer verwenden", 'PROJECT_FTP_URL_DESC'=>"FTP-Server, Format: <tt>ftp://benutzer:kennwort@hostname:port/pfad/.../pfad/</tt>.<br/>Lassen Sie dieses Feld leer, wenn die Seiten ausschließlich lokal erzeugt werden sollen.", 'PROJECT_FTP_URL'=>"FTP-Server URL", -'PROJECT_INFO_COUNT_OBJECTS'=>"Anzahl Objekte", -'PROJECT_INFO_SUM_FILESIZE'=>"Gesamtgröße aller Dateien", +'COUNT_OBJECTS'=>"Anzahl Objekte", +'SUM_FILESIZE'=>"Gesamtgröße aller Dateien", 'PROJECT_LOCAL_FOLDER_DESC'=>"Ein Ordner im lokalen Dateisystem auf dem Server, z.B. <tt>/home/user/dir</tt>(Unix) oder <tt>c:/dokumente/ordner</tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Lokales Verzeichnis", 'PROJECT_LOCALPATH_DESC'=>"Lokales Verzeichnis, Format: <tt>/pfad/.../pfad/</tt>.<br/>Dieses Feld kann leer bleiben, sofern Sie ausschließlich Seiten über FTP erzeugen möchten.", @@ -1214,6 +1213,7 @@ function language() { return array( 'EL_LIST'=>"List", 'FILE_IMAGE_NEW_HEIGHT'=>"New height", 'FILE_IMAGE_NEW_WIDTH'=>"New width", +'GLOBAL_LANGUAGE'=>"Sprache", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"Hint: There are no templates available.", 'GLOBAL_SHOW'=>"Show", 'GLOBAL_TIME'=>"Time", @@ -1281,10 +1281,10 @@ function language() { return array( 'QRCODE_SHOW'=>"QR-Code anzeigen", 'LABEL'=>"Anzeigename", 'NAME'=>"Name", -'SOURCE'=>"Quelltext", 'GLOBAL_PUBLISHED'=>"Veröffentlicht", 'SECURITY'=>"Sicherheit", 'USER_LAST_LOGIN'=>"Letzte Anmeldung", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Kennwort ändern", +'SOURCE'=>"Quelltext", );} \ No newline at end of file diff --git a/modules/language/lang-en.php b/modules/language/lang-en.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Is default", 'GLOBAL_KEY'=>"Key", 'GLOBAL_LANGUAGES_DESC'=>"All content can be created in several languages", -'GLOBAL_LANGUAGE'=>"Language", 'GLOBAL_LANGUAGES'=>"Languages", 'GLOBAL_LASTCHANGE'=>"Last Change", 'GLOBAL_LINK_TO'=>"Shortcut to", @@ -1069,8 +1068,8 @@ function language() { return array( 'PROJECT_FTP_PASSIVE'=>"use passive FTP-Transfer", 'PROJECT_FTP_URL_DESC'=>"FTP server, format: <tt>ftp://user:pw@hostname:port/path/.../path/</tt>.<br/>Leave this blank, if you are only generating local.", 'PROJECT_FTP_URL'=>"FTP-Server URL", -'PROJECT_INFO_COUNT_OBJECTS'=>"Objects count", -'PROJECT_INFO_SUM_FILESIZE'=>"Size of all files", +'COUNT_OBJECTS'=>"Objects count", +'SUM_FILESIZE'=>"Size of all files", 'PROJECT_LOCAL_FOLDER_DESC'=>"A Directy in the local filesystem on the server, example: <tt>/home/user/dir</tt>(Unix) or <tt>c:/documents/dir</tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Local directory", 'PROJECT_LOCALPATH_DESC'=>"Local directory, format: <tt>/path/.../path/</tt>.<br/>Leave blank, if you are only publishing via FTP.", @@ -1214,6 +1213,7 @@ function language() { return array( 'EL_LIST'=>"List", 'FILE_IMAGE_NEW_HEIGHT'=>"New height", 'FILE_IMAGE_NEW_WIDTH'=>"New width", +'GLOBAL_LANGUAGE'=>"Language", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"Hint: There are no templates available.", 'GLOBAL_SHOW'=>"Show", 'GLOBAL_TIME'=>"Time", @@ -1281,10 +1281,10 @@ function language() { return array( 'QRCODE_SHOW'=>"Show QR-Code", 'LABEL'=>"Label", 'NAME'=>"Name", -'SOURCE'=>"Source", 'GLOBAL_PUBLISHED'=>"Published", 'SECURITY'=>"Security", 'USER_LAST_LOGIN'=>"Last Logon", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Change password", +'SOURCE'=>"Source", );} \ No newline at end of file diff --git a/modules/language/lang-es.php b/modules/language/lang-es.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Is default", 'GLOBAL_KEY'=>"Clef", 'GLOBAL_LANGUAGES_DESC'=>"Tout le contenu peut être créé dans plusieurs langues", -'GLOBAL_LANGUAGE'=>"Langue", 'GLOBAL_LANGUAGES'=>"Langues", 'GLOBAL_LASTCHANGE'=>"Dernier changement", 'GLOBAL_LINK_TO'=>"Raccourci à", @@ -1093,8 +1092,8 @@ MENU_INDEX_ADMINISTRATION_DESC =", 'PROJECT_FTP_PASSIVE'=>"pasivo Ftp-Transfiere", 'PROJECT_FTP_URL_DESC'=>", formato: <tt> ftp://user:pw@hostname:port/path/.../path/ </tt>.<br/>Leave este espacio en blanco, si estás generando solamente a local.", 'PROJECT_FTP_URL'=>"FTP-Server URL", -'PROJECT_INFO_COUNT_OBJECTS'=>"Objects count", -'PROJECT_INFO_SUM_FILESIZE'=>"Size of all files", +'COUNT_OBJECTS'=>"Objects count", +'SUM_FILESIZE'=>"Size of all files", 'PROJECT_LOCAL_FOLDER_DESC'=>"un Directy en el filesystem local en el servidor, ejemplo: <tt>/home/user/dir</tt> (Unix) o <tt>c: El trabajo de la descripción del proyecto de /documents/dir</tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Directorio local", 'PROJECT_LOCALPATH_DESC'=>"Directorio local, formato: espacio en blanco de <tt>/path/? /path/</tt>.<br/>Leave, si estás publicando solamente vía el ftp.", @@ -1238,6 +1237,7 @@ MENU_INDEX_ADMINISTRATION_DESC =", 'EL_LIST'=>"Lista", 'FILE_IMAGE_NEW_HEIGHT'=>"Nueva altura", 'FILE_IMAGE_NEW_WIDTH'=>"Nueva anchura", +'GLOBAL_LANGUAGE'=>"Langue", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"<em>Hint : </em> là ne sont aucun calibre disponible.", 'GLOBAL_SHOW'=>"Montrer", 'GLOBAL_TIME'=>"Temps", @@ -1305,10 +1305,10 @@ MENU_INDEX_ADMINISTRATION_DESC =", 'QRCODE_SHOW'=>"Show QR-Code", 'LABEL'=>"Label", 'NAME'=>"Name", -'SOURCE'=>"Source", 'GLOBAL_PUBLISHED'=>"Published", 'SECURITY'=>"Security", 'USER_LAST_LOGIN'=>"Last Logon", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Change password", +'SOURCE'=>"Source", );} \ No newline at end of file diff --git a/modules/language/lang-fr.php b/modules/language/lang-fr.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Is default", 'GLOBAL_KEY'=>"Clef", 'GLOBAL_LANGUAGES_DESC'=>"Tout le contenu peut être créé dans plusieurs langues", -'GLOBAL_LANGUAGE'=>"Langue", 'GLOBAL_LANGUAGES'=>"Langues", 'GLOBAL_LASTCHANGE'=>"Dernier changement", 'GLOBAL_LINK_TO'=>"Raccourci à", @@ -1069,8 +1068,8 @@ function language() { return array( 'PROJECT_FTP_PASSIVE'=>"employer passif Ftp-Transfèrent", 'PROJECT_FTP_URL_DESC'=>"Ftp server, format : <tt> ftp://user:pw@hostname:port/path/.../path/ </tt>.<br/>Leave ce blanc, si vous produisez seulement des gens du pays.", 'PROJECT_FTP_URL'=>"URL de ftp server", -'PROJECT_INFO_COUNT_OBJECTS'=>"Objects count", -'PROJECT_INFO_SUM_FILESIZE'=>"Size of all files", +'COUNT_OBJECTS'=>"Objects count", +'SUM_FILESIZE'=>"Size of all files", 'PROJECT_LOCAL_FOLDER_DESC'=>"Un Directy dans le filesystem local sur le serveur, exemple : <tt>/home/user/dir</tt> (Unix) ou <tt>c : /documents/dir</tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Annuaire local", 'PROJECT_LOCALPATH_DESC'=>"Annuaire local, format : blanc de <tt>/path/? /path/</tt>.<br/>Leave, si vous éditez seulement par l'intermédiaire du ftp.", @@ -1214,6 +1213,7 @@ function language() { return array( 'EL_LIST'=>"Liste", 'FILE_IMAGE_NEW_HEIGHT'=>"Nouvelle taille", 'FILE_IMAGE_NEW_WIDTH'=>"Nouvelle largeur", +'GLOBAL_LANGUAGE'=>"Langue", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"<em>Hint : </em> là ne sont aucun calibre disponible.", 'GLOBAL_SHOW'=>"Montrer", 'GLOBAL_TIME'=>"Temps", @@ -1281,10 +1281,10 @@ function language() { return array( 'QRCODE_SHOW'=>"Show QR-Code", 'LABEL'=>"Label", 'NAME'=>"Name", -'SOURCE'=>"Source", 'GLOBAL_PUBLISHED'=>"Published", 'SECURITY'=>"Securité", 'USER_LAST_LOGIN'=>"Last Logon", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Change password", +'SOURCE'=>"Source", );} \ No newline at end of file diff --git a/modules/language/lang-it.php b/modules/language/lang-it.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Is default", 'GLOBAL_KEY'=>"Llave", 'GLOBAL_LANGUAGES_DESC'=>"Todo el contenido se puede crear en varias idiomas", -'GLOBAL_LANGUAGE'=>"Lengua", 'GLOBAL_LANGUAGES'=>"Idiomas", 'GLOBAL_LASTCHANGE'=>"Cambio pasado", 'GLOBAL_LINK_TO'=>"Atajo a", @@ -1069,8 +1068,8 @@ function language() { return array( 'PROJECT_FTP_PASSIVE'=>"passivo Ftp-Trasferisce", 'PROJECT_FTP_URL_DESC'=>", disposizione: <tt> ftp://user:pw@hostname:port/path/.../path/ </tt>.<br/>Leave questo spazio in bianco, se state generando soltanto il local.", 'PROJECT_FTP_URL'=>"FTP-Url", -'PROJECT_INFO_COUNT_OBJECTS'=>"Objects count", -'PROJECT_INFO_SUM_FILESIZE'=>"Size of all files", +'COUNT_OBJECTS'=>"Objects count", +'SUM_FILESIZE'=>"Size of all files", 'PROJECT_LOCAL_FOLDER_DESC'=>"un Directy nel filesystem locale sull'assistente, esempio: <tt>/home/user/dir</tt> (Unix) o <tt>c: Il lavoro di descrizione di progetto di /documents/dir</tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Indice locale", 'PROJECT_LOCALPATH_DESC'=>"Indice locale, disposizione: spazio in bianco di <tt>/path/? /path/</tt>.<br/>Leave, se state pubblicando soltanto via il ftp.", @@ -1214,6 +1213,7 @@ function language() { return array( 'EL_LIST'=>"Listing", 'FILE_IMAGE_NEW_HEIGHT'=>"Nueva altura", 'FILE_IMAGE_NEW_WIDTH'=>"Nueva anchura", +'GLOBAL_LANGUAGE'=>"Lengua", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"<em>Hint : </em> là ne sont aucun calibre disponible.", 'GLOBAL_SHOW'=>"Montrer", 'GLOBAL_TIME'=>"Tiempo", @@ -1281,10 +1281,10 @@ function language() { return array( 'QRCODE_SHOW'=>"Show QR-Code", 'LABEL'=>"Label", 'NAME'=>"Name", -'SOURCE'=>"Source", 'GLOBAL_PUBLISHED'=>"Published", 'SECURITY'=>"Security", 'USER_LAST_LOGIN'=>"Last Logon", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Change password", +'SOURCE'=>"Source", );} \ No newline at end of file diff --git a/modules/language/lang-ru.php b/modules/language/lang-ru.php @@ -426,7 +426,6 @@ function language() { return array( 'GLOBAL_IS_DEFAULT'=>"Is default", 'GLOBAL_KEY'=>"Key", 'GLOBAL_LANGUAGES_DESC'=>"Языки Все содержание могут быть созданы на нескольких языках", -'GLOBAL_LANGUAGE'=>"Ключевые Язык Sprache", 'GLOBAL_LANGUAGES'=>"Languages", 'GLOBAL_LASTCHANGE'=>"Последние изменения", 'GLOBAL_LINK_TO'=>"Ярлыки Ярлыки для перехода", @@ -1069,8 +1068,8 @@ function language() { return array( 'PROJECT_FTP_PASSIVE'=>"использовать пассивный FTP - передача", 'PROJECT_FTP_URL_DESC'=>"URL FTP-сервера, ж ormat : @ ftp://user:pw хоста : порт / путь / ... / р нат / . Оставьте <br> т его пустым, если вы только на месте.", 'PROJECT_FTP_URL'=>"- FTP Server", -'PROJECT_INFO_COUNT_OBJECTS'=>"Objects count", -'PROJECT_INFO_SUM_FILESIZE'=>"Size of all files", +'COUNT_OBJECTS'=>"Objects count", +'SUM_FILESIZE'=>"Size of all files", 'PROJECT_LOCAL_FOLDER_DESC'=>"каталог Directy в локальной файловой системе на сервере, например : / дом / пользователь / директория (Unix) или с <tt> : / документы / директория </tt> (Windows)", 'PROJECT_LOCAL_FOLDER'=>"Local directory", 'PROJECT_LOCALPATH_DESC'=>"Местный каталог, формат : <tt> / путь / ... / путь / </tt>. <br> Оставьте пустым, я Вы ж только публикации через FTP. Местный", @@ -1214,6 +1213,7 @@ function language() { return array( 'EL_LIST'=>"List", 'FILE_IMAGE_NEW_HEIGHT'=>"Новая высота", 'FILE_IMAGE_NEW_WIDTH'=>"Новая ширина климата", +'GLOBAL_LANGUAGE'=>"Ключевые Язык Sprache", 'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'=>"<em> Подсказка : </em> Там нет шаблонов имеется.", 'GLOBAL_SHOW'=>"Show", 'GLOBAL_TIME'=>"Time", @@ -1281,10 +1281,10 @@ function language() { return array( 'QRCODE_SHOW'=>"Show QR-Code", 'LABEL'=>"Label", 'NAME'=>"Name", -'SOURCE'=>"Source", 'GLOBAL_PUBLISHED'=>"Published", 'SECURITY'=>"Security", 'USER_LAST_LOGIN'=>"Last Logon", 'TOKEN'=>"Token", 'EDIT_PASSWORD'=>"Change password", +'SOURCE'=>"Source", );} \ No newline at end of file diff --git a/modules/language/language.yml b/modules/language/language.yml @@ -4346,10 +4346,6 @@ MENU_TEMPLATE_EXTENSION: de: Erweiterung en: Extension fr: Prolongation -TEMPLATE_EXTENSION: - de: Erweiterung - en: Extension - fr: Prolongation MENU_TEMPLATE_LISTING: de: Anzeigen en: All templates @@ -5226,10 +5222,10 @@ PROJECT_FTP_URL: fr: URL de ftp server it: FTP-Url ru: '- FTP Server' -PROJECT_INFO_COUNT_OBJECTS: +COUNT_OBJECTS: de: Anzahl Objekte en: Objects count -PROJECT_INFO_SUM_FILESIZE: +SUM_FILESIZE: de: Gesamtgröße aller Dateien en: Size of all files PROJECT_LOCAL_FOLDER_DESC: