mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

GUI fixes and theme-handler warning removal.

Browse Source
This commit is contained in:
Cameron
2013-03-15 05:28:27 -07:00
parent 340156aebd
commit 33e7300b32
6 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/credits.php
View File

@@ -22,7 +22,7 @@ $css = "body { text-align: left; font-size:13px; line-height:1.5em; font-wei
a:hover { color:#134B63; text-decoration:none; }
.bold { font-weight:bold; }
.center { text-align:center; }
.wrapper { width:800px; height:415px; margin:0px auto 0px 0px; padding-bottom:10px; background-color: #ebeef0; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; }
.wrapper { width:800px; height:415px; margin:0px auto 0px 0px; padding-bottom:10px; }
.wrapper-top { height:10px; }
.wrapper-bottom { height:6px; }
.wrapper-middle { min-height:389px; background-color:#FDFDFD0; }

4
e107_admin/newspost.php
View File

@@ -319,7 +319,7 @@ class news_sub_form_ui extends e_admin_form_ui
if($approved == 0)
{
//$text = $this->submit_image('submitnews['.$id.']', 1, 'execute', NWSLAN_58);
$text = "<a href='".e_SELF."?mode=main&action=create&sub={$id}'>".ADMIN_EXECUTE_ICON."</a>";
$text = "<a class='btn btn-large' href='".e_SELF."?mode=main&action=create&sub={$id}'>".ADMIN_EXECUTE_ICON."</a>";
// NWSLAN_103;
}
else // Already submitted;
@@ -327,7 +327,7 @@ class news_sub_form_ui extends e_admin_form_ui
}
$text .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete'.$delcls));
$text .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'btn btn-large action delete'.$delcls));
$text .= "</div>";
return $text;
}

8
e107_admin/prefs.php
View File

@@ -1452,9 +1452,8 @@ $text .= "
<tr>
<td>".PRFLAN_48.":</td>
<td>
<div class='field-spacer'>".$frm->radio_multi('user_tracking', array('cookie' => PRFLAN_49, 'session' => PRFLAN_50), $pref['user_tracking'])."</div>
".PRFLAN_55.": <br />".$frm->text('cookie_name', $pref['cookie_name'], 20)."
<td class='form-inline'>
".$frm->radio_multi('user_tracking', array('cookie' => PRFLAN_49, 'session' => PRFLAN_50), $pref['user_tracking'])." ".PRFLAN_55.": ".$frm->text('cookie_name', $pref['cookie_name'], 20)."
</td>
</tr>
@@ -1731,8 +1730,9 @@ $text .= "
$js_types = array(
array('id' => 'prototype', 'name'=> 'Prototype (local)'),
array('id' => 'jquery', 'name'=> 'jQuery (local)'),
array('id' => 'prototype', 'name'=> 'Prototype (local)'),
);
//TODO // separate switch for CDN.. or automatic fall-back.

8
e107_admin/search.php
View File

@@ -243,14 +243,14 @@ if ($query[0] == 'settings')
</tr>
<tr>
<td>".SEALAN_12."</td>
<td>
<td class='form-inline'>
".$frm->radio_multi('time_restrict', array(0 => LAN_DISABLED, 1 => SEALAN_13), $search_prefs['time_restrict'])."&nbsp;
".$frm->text('time_secs', $tp -> toForm($search_prefs['time_secs']), 3, 'class=tbox&size=5')."&nbsp;".SEALAN_14."
</td>
</tr>
<tr>
<td>".SEALAN_3."</td>
<td>
<td class='form-inline'>
".$frm->radio_switch('search_sort', $search_prefs['mysql_sort'], 'MySQL', SEALAN_31)."&nbsp;
".$frm->text('php_limit', $tp -> toForm($search_prefs['php_limit']), 5, 'class=tbox&size=5')."&nbsp;".SEALAN_32."
<span class='field-help'>".SEALAN_49."</span>
@@ -385,7 +385,7 @@ else
</select>
</td>
<td class='center'>
<a href='".e_SELF."?edit.c.".$key."'>".ADMIN_EDIT_ICON."</a>
<a class='btn btn-large' href='".e_SELF."?edit.c.".$key."'>".ADMIN_EDIT_ICON."</a>
</td>
</tr>
";
@@ -411,7 +411,7 @@ else
</select>
</td>
<td class='center'>
<a href='".e_SELF."?edit.p.".$plug_dir."'>".ADMIN_EDIT_ICON."</a>
<a class='btn btn-large' href='".e_SELF."?edit.p.".$plug_dir."'>".ADMIN_EDIT_ICON."</a>
</td>
</tr>
";

2
e107_handlers/form_handler.php
View File

@@ -2472,7 +2472,7 @@ class e_form
}
$thsrc = $tp->thumbUrl(vartrue($parms['pre']).$value, $thparms, varset($parms['thumb_urlraw']));
$alt = $src;
$ttl = '<img src="'.$thsrc.'" alt="'.$alt.'" class="e-thumb" />';
$ttl = '<img src="'.$thsrc.'" alt="'.$alt.'" class="thumbnail e-thumb" />';
$value = '<a href="'.$src.'" class="e-dialog e-image-preview" title="'.$alt.'" rel="external">'.$ttl.'</a>';
}
else

28
e107_handlers/theme_handler.php
View File

@@ -1722,7 +1722,7 @@ class themeHandler
$custom = array();
/*
foreach ($vars['layouts'] as $layout)
{
foreach ($layout as $key=>$val)
@@ -1730,31 +1730,49 @@ class themeHandler
$name = $val['@attributes']['name'];
unset($val['@attributes']['name']);
$lays[$name] = $val;
if(isset($val['customPages']))
{
$custom[$name] = array_filter(explode(" ", $val['customPages']));
$cusArray = explode(" ", $val['customPages']);
$custom[$name] = array_filter($cusArray);
}
if(isset($val['custompages']))
{
$cusArray = explode(" ", $val['custompages']);
$custom[$name] = array_filter(explode(" ", $val['custompages']));
}
}
}
*/
foreach($vars['layouts']['layout'] as $k=>$val)
{
$name = $val['@attributes']['name'];
unset($val['@attributes']['name']);
$lays[$name] = $val;
if(is_string($val['custompages']))
{
$custom[$name] = array_filter(explode(" ", $val['custompages']));
}
}
$vars['layouts'] = $lays;
$vars['path'] = $path;
$vars['custompages'] = $custom;
$mes = e107::getMessage(); // DEBUG
/*
if($path == "bootstrap" || $path == "e107v4a")
if($path == "bootstrap" )
{
$mes->addDebug("<h2>".$path."</h2>");
$mes->addDebug(print_a($vars,true));
$mes->addDebug("<hr />");
}
*/
return $vars;
}