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

Some infopanel cleanup

Browse Source
This commit is contained in:
CaMer0n
2009-10-22 23:43:21 +00:00
parent 826bcf2c13
commit b7f9fc77ba
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
e107_admin/includes/infopanel.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $
| $Revision: 1.12 $ | $Revision: 1.13 $
| $Date: 2009-09-18 23:14:00 $ | $Date: 2009-10-22 23:43:15 $
| $Author: e107coders $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -131,7 +131,8 @@ $text .= "
<tr> <tr>
<th>Timestamp</th> <th>Timestamp</th>
<th>Username</th> <th>Username</th>
<th>Location</th> <th>IP</th>
<th>Page</th>
</tr> </tr>
</thead> </thead>
<tbody>"; <tbody>";
@@ -141,9 +142,10 @@ $text .= "
foreach ($newsarray as $key=>$val) foreach ($newsarray as $key=>$val)
{ {
$text .= "<tr> $text .= "<tr>
<td>".$val['online_timestamp']."</td> <td class='nowrap'>".e107::getDateConvert()->convert_date($val['online_timestamp'],'short')."</td>
<td>".$val['online_user_id']."</td> <td>".renderOnlineName($val['online_user_id'])."</td>
<td>".$val['online_location']."</td> <td>".($val['online_ip'])."</td>
<td class='nowrap'><a href='".$val['online_location']."'>".$tp->text_truncate($val['online_location'],50)."</a></td>
</tr> </tr>
"; ";
} }
@@ -157,11 +159,13 @@ $text .= "
if (varset($user_pref['core-infopanel-menus'])) if (varset($user_pref['core-infopanel-menus']))
{ {
foreach ($user_pref['core-infopanel-menus'] as $val) foreach ($user_pref['core-infopanel-menus'] as $val)
{ {
$id = $frm->name2id('core-infopanel_'.$val);
$text .= " $text .= "
<div id='core-infopanel_{$val}' class='f-left' style='width:49%' > <div id='".$id."' class='f-left' style='width:24.5%' >
<div style='border:1px solid silver;margin:10px'> <div class='left' style='border:1px solid silver;margin:10px'>
"; ";
$text .= $tp->parseTemplate("{PLUGIN=$val|TRUE}"); $text .= $tp->parseTemplate("{PLUGIN=$val|TRUE}");
$text .= " $text .= "
@@ -186,6 +190,17 @@ $text .= "</form>";
$text .= "</div>"; $text .= "</div>";
$ns->tablerender(ADLAN_47." ".ADMINNAME, $emessage->render().$text); $ns->tablerender(ADLAN_47." ".ADMINNAME, $emessage->render().$text);
function renderOnlineName($val)
{
if($val==0)
{
return "Guest";
}
return $val;
}
function render_info_panel($caption, $text) function render_info_panel($caption, $text)
{ {
return "<div class='main_caption bevel left'><b>".$caption."</b></div> return "<div class='main_caption bevel left'><b>".$caption."</b></div>
@@ -258,9 +273,11 @@ function render_infopanel_menu_options()
{ {
while ($row = e107::getDb()->db_Fetch()) while ($row = e107::getDb()->db_Fetch())
{ {
$checked = ($settings && in_array($row['menu_name'], $settings)) ? true : false; $label = str_replace("_menu","",$row['menu_name']);
$text .= "<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>"; $path_to_menu = $row['menu_path'].$row['menu_name'];
$text .= $frm->checkbox_label($row['menu_name'], "e-mymenus[]", $row['menu_name'], $checked); $checked = ($settings && in_array($path_to_menu, $settings)) ? true : false;
$text .= "\n<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>";
$text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked);
$text .= "</div>"; $text .= "</div>";
} }
} }

10
e107_files/shortcode/batch/admin_shortcodes_class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: admin_shortcodes_class.php,v 1.26 2009-10-21 11:41:15 secretr Exp $ * $Id: admin_shortcodes_class.php,v 1.27 2009-10-22 23:43:21 e107coders Exp $
* *
* Admin shortcode batch - class * Admin shortcode batch - class
*/ */
@@ -275,7 +275,7 @@ class admin_shortcodes
$active_uploads = $sql -> db_Count('upload', '(*)', 'WHERE upload_active = 0'); $active_uploads = $sql -> db_Count('upload', '(*)', 'WHERE upload_active = 0');
$submitted_news = $sql -> db_Count('submitnews', '(*)', 'WHERE submitnews_auth = 0'); $submitted_news = $sql -> db_Count('submitnews', '(*)', 'WHERE submitnews_auth = 0');
$text = "<div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN."newspost.php?sn'>".ADLAN_LAT_2.": $submitted_news</a>" : ' '.ADLAN_LAT_2.': 0').'</div>'; $text = "<div class='left'><div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN."newspost.php?sn'>".ADLAN_LAT_2.": $submitted_news</a>" : ' '.ADLAN_LAT_2.': 0').'</div>';
$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : ' '.ADLAN_LAT_7.': '.$active_uploads).'</div>'; $text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : ' '.ADLAN_LAT_7.': '.$active_uploads).'</div>';
if(vartrue($pref['e_latest_list'])) if(vartrue($pref['e_latest_list']))
@@ -301,7 +301,7 @@ class admin_shortcodes
{ {
$text .= "<br /><b><a href='".e_ADMIN."message.php'>".ADLAN_LAT_8." [".$amount."]</a></b>"; $text .= "<br /><b><a href='".e_ADMIN."message.php'>".ADLAN_LAT_8." [".$amount."]</a></b>";
} }
$text .= "</div>";
return $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE); return $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE);
} }
} }
@@ -814,7 +814,7 @@ class admin_shortcodes
$comments = $sql -> db_Count('comments'); $comments = $sql -> db_Count('comments');
$unver = ($unverified ? " <a href='".e_ADMIN."users.php?unverified'>".ADLAN_111."</a>" : ADLAN_111); $unver = ($unverified ? " <a href='".e_ADMIN."users.php?unverified'>".ADLAN_111."</a>" : ADLAN_111);
$text = "<div style='padding-bottom: 2px;'>".E_16_USER." ".ADLAN_110.": ".$members."</div>"; $text = "<div class='left'><div style='padding-bottom: 2px;'>".E_16_USER." ".ADLAN_110.": ".$members."</div>";
$text .= "<div style='padding-bottom: 2px;'>".E_16_USER." {$unver}: ".$unverified."</div>"; $text .= "<div style='padding-bottom: 2px;'>".E_16_USER." {$unver}: ".$unverified."</div>";
$text .= "<div style='padding-bottom: 2px;'>".E_16_BANLIST." ".ADLAN_112.": ".$banned."</div>"; $text .= "<div style='padding-bottom: 2px;'>".E_16_BANLIST." ".ADLAN_112.": ".$banned."</div>";
$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT." ".ADLAN_114.": ".$comments."</div>"; $text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT." ".ADLAN_114.": ".$comments."</div>";
@@ -834,6 +834,7 @@ class admin_shortcodes
{ {
$text .= "<img src='".e_IMAGE."admin_images/failedlogin_16.png' alt='' class='icon S16' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>"; $text .= "<img src='".e_IMAGE."admin_images/failedlogin_16.png' alt='' class='icon S16' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>";
} }
$text .= "</div>";
return $ns -> tablerender(ADLAN_134, $text, '', TRUE); return $ns -> tablerender(ADLAN_134, $text, '', TRUE);
} }
} }
@@ -947,6 +948,7 @@ class admin_shortcodes
function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='')
{ {
$exit = ""; $exit = "";
$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' "; $text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
if ($cat_id) if ($cat_id)