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

Merged upstream changes.

Browse Source
This commit is contained in:
Lóna Lore
2017-01-15 23:10:46 +01:00
parent efeeeb94a4 5814011369
commit 8b7631995e
83 changed files with 1606 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -491,14 +491,14 @@ class admin_shortcodes
$allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly.
$text = "<ul id='e-latest' class='unstyled list-unstyled'>";
$text = "<ul id='e-latest' class='list-group'>";
foreach($allconfigs as $k=>$v)
{
foreach($v as $val)
{
$class = admin_shortcodes::getBadge($val['total']);
$link = "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";
$text .= "<li class='clearfix'>".$val['icon']." ".$link."</li>\n";
$link = "<a href='".$val['url']."'>".$val['icon']." ".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";
$text .= "<li class='list-group-item clearfix'>".$link."</li>\n";
}
}
$text .= "</ul>";
@@ -1199,15 +1199,15 @@ class admin_shortcodes
$allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly.
$text = "<ul id='e-status' class='unstyled list-unstyled'>";
$text = "<ul id='e-status' class='list-group'>";
foreach($allconfigs as $k=>$v)
{
foreach($v as $val)
{
$type = empty($val['invert']) ? 'latest' : 'invert';
$class = admin_shortcodes::getBadge($val['total'], $type);
$link = "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";
$text .= "<li>".$val['icon']." ".$link."</li>\n";
$link = "<a href='".$val['url']."'>".$val['icon']." ".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";
$text .= "<li class='list-group-item'>".$link."</li>\n";
}
}
$text .= "</ul>";

4
e107_core/shortcodes/single/email_item.sc
View File

@@ -15,12 +15,12 @@ if(deftrue('BOOTSTRAP'))
elseif (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL))
{
$icon = THEME_ABS."images/".ICONMAIL;
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' class='icon S16 action' />";
}
else
{
$icon = e_IMAGE_ABS."generic/email.png";
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' class='icon S16 action' />";
}
// message^source^other_parms

4
e107_core/shortcodes/single/print_item.sc
View File

@@ -10,12 +10,12 @@ if(deftrue('BOOTSTRAP'))
elseif (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
{
$icon = THEME_ABS."images/".ICONPRINT;
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' class='icon S16 action' />";
}
else
{
$icon = e_IMAGE_ABS."generic/printer.png";
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' class='icon S16 action' />";
}

38
e107_core/shortcodes/single/user_avatar.php
View File

@@ -2,20 +2,36 @@
// $Id$
function user_avatar_shortcode($parm=null)
{
if(!empty($parm) && is_string($parm))
$data = null;
if(!empty($parm))
{
$data = array('user_image'=>$parm);
}
elseif(!empty($parm) && is_array($parm))
{
$data = $parm;
}
else
{
$data = null;
if(is_numeric($parm))
{
$id = intval($parm);
$data = e107::user($id);
$parm = null;
}
if(is_string($parm))
{
$data = array('user_image'=>$parm);
}
elseif(is_array($parm))
{
if(isset($parm['user_image']))
{
$data = $parm;
}
else
{
$data = null;
}
}
}
return e107::getParser()->toAvatar($data, $data);
return e107::getParser()->toAvatar($data, $parm);
/*
global $loop_uid;

8
e107_core/templates/signup_template.php
View File

@@ -89,8 +89,8 @@ if(!defined($SIGNUP_EXTENDED_USER_FIELDS))
$SIGNUP_EXTENDED_USER_FIELDS = "
<tr>
<td style='width:40%' class='forumheader3'>
{EXTENDED_USER_FIELD_TEXT}
{EXTENDED_USER_FIELD_REQUIRED}
<label>{EXTENDED_USER_FIELD_TEXT}
{EXTENDED_USER_FIELD_REQUIRED}</label>
</td>
<td style='width:60%' class='forumheader3'>
{EXTENDED_USER_FIELD_EDIT}
@@ -152,7 +152,7 @@ $sc_style['SIGNUP_LOGINNAME']['post'] = "
$sc_style['SIGNUP_HIDE_EMAIL']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_USER_83."</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>".LAN_USER_83."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_HIDE_EMAIL']['post'] = "
</td>
@@ -182,7 +182,7 @@ $sc_style['SIGNUP_PASSWORD2']['post'] = "</td>
</tr>";
$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_113."</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>".LAN_SIGNUP_113."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['post'] = "</td>
</tr>";

1
e107_core/xml/default_install.xml
View File

@@ -98,6 +98,7 @@
<core name="e_meta_list"><![CDATA[array (
'rss_menu' => 'rss_menu',
)]]></core>
<core name="e_module_list"><![CDATA[array ()]]></core>
<core name="e_related_list"><![CDATA[array (
'news' => 'news',
'page' => 'page',