mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-15 10:02:02 +02:00
Code Issues Releases Wiki Activity

Corrected layout of Theme XML generator. Default news template cleanup. Clickable URL fix for when   is present.

Browse Source
This commit is contained in:
Cameron 2016-03-15 23:37:38 -07:00
parent dc7343ed3c
commit 5348c02223
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
e107_admin/theme.php
View File

@ -398,7 +398,7 @@ class theme_builder
{
$nm = $key.'-'.$type;
$name = "xml[$nm]";
$size = (count($val)==1) ? 'span7' : 'span2';
$size = (count($val)==1) ? 'col-md-7' : 'col-md-2';
$text .= "<div class='{$size}'>".$this->xmlInput($name, $key."-". $type, vartrue($defaults[$nm]))."</div>";
}
@ -588,7 +588,8 @@ TEMPLATE;
$size = 30;
$help = '';
$sizex = '';
switch ($info)
{
@ -601,7 +602,7 @@ TEMPLATE;
case 'main-lang':
$help = TPVLAN_CONV_4;
$required = false;
$placeholder= " ";
$placeholder= "LAN equivalent";
$pattern = "[A-Z0-9_]*";
break;
@ -644,7 +645,7 @@ TEMPLATE;
case 'summary-summary':
$help = TPVLAN_CONV_10;
$required = true;
$size = 100;
$size = 200;
$placeholder= " ";
$pattern = "[A-Za-z,() \.0-9]*";
break;
@ -681,7 +682,8 @@ TEMPLATE;
$req = ($required == true) ? "&required=1" : "";
$placeholder = (varset($placeholder)) ? $placeholder : $type;
$pat = ($pattern) ? "&pattern=".$pattern : "";
$text = '';
switch ($type)
{
@ -695,9 +697,9 @@ TEMPLATE;
$file = str_replace(e_THEME.$this->themeName."/",'',$path);
$text .= "<div class='row-fluid'>";
$text .= "<div class='controls'>";
$text .= "<div class='span3'>".$frm->checkbox($name.'['.$key.'][file]',$file, false, array('label'=>$file))."
$text .= "<div class='col-md-3'>".$frm->checkbox($name.'['.$key.'][file]',$file, false, array('label'=>$file))."
<div class='field-help'>".TPVLAN_CONV_14."</div></div>";
$text .= "<div class='span3'>".$frm->text($name.'['.$key.'][name]', $default, $size, 'placeholder='.$file . $req. $pat)."
$text .= "<div class='col-md-3'>".$frm->text($name.'['.$key.'][name]', $default, $size, 'placeholder='.$file . $req. $pat)."
<div class='field-help'>".TPVLAN_CONV_15."</div></div>";
// $text .= "<div class='span2'>".$frm->checkbox('css['.$key.'][file]',$file, false, array('label'=>$file))."</div>";
// $text .= "<div class='span2'>".$frm->text('css['.$key.'][name]', $default, $size, 'placeholder='.$placeholder . $req. $pat)."</div>";
@ -711,11 +713,11 @@ TEMPLATE;
case 'date':
$text = $frm->datepicker($name, time(), 'format=yyyy-mm-dd'.$req);
$text = $frm->datepicker($name, time(), 'format=yyyy-mm-dd'.$req.'&size=block-level');
break;
case 'description':
$text = $frm->textarea($name,$default, 3, 100, $req); // pattern not supported.
$text = $frm->textarea($name,$default, 3, 100, $req,'&size=block-level'); // pattern not supported.
break;
@ -733,7 +735,7 @@ TEMPLATE;
default:
$text = $frm->text($name, $default, $size, 'placeholder='.$placeholder . $req. $pat);
$text = $frm->text($name, $default, $size, 'placeholder='.$placeholder . $req. $pat.'&size=block-level');
break;
}

39
e107_plugins/news/templates/news_template.php
View File

@ -80,25 +80,30 @@ $NEWS_TEMPLATE['default']['item'] = '
';
*/
$NEWS_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_TEMPLATE['default']['item'] = '
{SETIMAGE: w=900&h=300}
{SETIMAGE: w=400&h=400}
<div class="default-item">
<h2 class="news-title">{NEWSTITLELINK}</h2>
<p class="lead">{GLYPH=user} &nbsp;{NEWSAUTHOR}</p>
<hr>
<div class="row">
<div class="col-md-4">{GLYPH=time} {NEWSDATE=short} </div>
<div class="col-md-8 text-right options">{GLYPH=tags} &nbsp;{NEWSTAGS} &nbsp; {GLYPH=folder-open} &nbsp;{NEWSCATEGORY} </div>
<hr class="news-heading-sep">
<div class="row">
<div class="col-md-6"><small>{GLYPH=user} &nbsp;{NEWSAUTHOR} &nbsp; {GLYPH=time} &nbsp;{NEWSDATE=short} </small></div>
<div class="col-md-6 text-right options"><small>{GLYPH=tags} &nbsp;{NEWSTAGS} &nbsp; {GLYPH=folder-open} &nbsp;{NEWSCATEGORY} </small></div>
</div>
<hr>
<hr>
{NEWSIMAGE: item=1}
<hr>
<p class="lead">{NEWSSUMMARY}</p>
{NEWSVIDEO: item=1}
<div class="text-justify">
{NEWSBODY}
</div>
<div class="text-right">
{EXTENDED}
</div>
<hr>
<div class="options">
<div class="btn-group hidden-print">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{PDFICON}{SOCIALSHARE}{ADMINOPTIONS: class=btn btn-default}</div>
@ -121,7 +126,7 @@ $NEWS_TEMPLATE['view']['item'] = '
{SETIMAGE: w=900&h=600}
<div class="view-item">
<h2 class="news-title">{NEWSTITLELINK}</h2>
<p class="lead">{NEWSSUMMARY}</p>
<hr class="news-heading-sep">
<div class="row">
<div class="col-md-6"><small>{GLYPH=user} &nbsp;{NEWSAUTHOR} &nbsp; {GLYPH=time} &nbsp;{NEWSDATE=short} </small></div>
@ -132,7 +137,10 @@ $NEWS_TEMPLATE['view']['item'] = '
<div class="body">
{NEWSIMAGE: item=1}
<p class="lead">{NEWSSUMMARY}</p>
<div class="text-justify">
{NEWSBODY=body}
</div>
<div class="news-videos-1">
{NEWSVIDEO: item=1}
{NEWSVIDEO: item=2}
@ -155,7 +163,7 @@ $NEWS_TEMPLATE['view']['item'] = '
{NEWSVIDEO: item=4}
{NEWSVIDEO: item=5}
<div class="body-extended">
<div class="body-extended text-justify">
{NEWSBODY=extended}
</div>
@ -171,6 +179,7 @@ $NEWS_TEMPLATE['view']['item'] = '
{NEWSRELATED}
<hr>
{NEWSNAVLINK}
';
//$NEWS_MENU_TEMPLATE['view']['separator'] = '<br />';
@ -201,7 +210,11 @@ $NEWS_TEMPLATE['category']['item'] = '
### Related 'start' - Options: Core 'single' shortcodes including {SETIMAGE}
### Related 'item' - Options: {RELATED_URL} {RELATED_IMAGE} {RELATED_TITLE} {RELATED_SUMMARY}
### Related 'end' - Options: Options: Core 'single' shortcodes including {SETIMAGE}
/*
$NEWS_TEMPLATE['related']['start'] = "<hr><h4>".defset('LAN_RELATED', 'Related')."</h4><ul class='e-related'>";
$NEWS_TEMPLATE['related']['item'] = "<li><a href='{RELATED_URL}'>{RELATED_TITLE}</a></li>";
$NEWS_TEMPLATE['related']['end'] = "</ul>";
$NEWS_TEMPLATE['related']['end'] = "</ul>";*/
$NEWS_TEMPLATE['related']['start'] = '{SETIMAGE: w=350&h=350&crop=1}<h2 class="caption">YOU MIGHT ALSO LIKE</h2><div class="row">';
$NEWS_TEMPLATE['related']['item'] = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>';
$NEWS_TEMPLATE['related']['end'] = '</div>';