mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

More bootstrap changes.

Browse Source
This commit is contained in:
Cameron 2012-11-26 18:42:11 -08:00
parent 5e84eaf34d
commit 93aca4d8e1
16 changed files with 164 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin.php
View File

@ -179,7 +179,7 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode
else
{
if($mode != "div")
if($mode != "div" && $mode != 'div-icon-only')
{
if ($td == (ADLINK_COLS+1))
{

287
e107_admin/credits.php
View File

@ -1,249 +1,66 @@
<?php
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*
*
* $URL$
* $Id$
*/
+ ----------------------------------------------------------------------------+
| e107 website system
| Copyright (C) 2008-2012 e107 Inc (e107.org)
|
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
| $URL: https://e107.svn.sourceforge.net/svnroot/e107/trunk/e107_0.7/e107_admin/credits.php $
| $Id: credits.php 12477 2011-12-28 03:12:22Z e107coders $
+----------------------------------------------------------------------------+
*/
require_once("../class2.php");
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
$css = "body { text-align: left; font-size:13px; line-height:1.5em; font-weight:normal; font-family:Arial, Helvetica, sans-serif; }
p { margin:0px 5px 10px 5px; }
h1 { font-size:20px; color:#134B63; font-weight:normal; line-height:1em; margin:20px 0px 5px 0px; }
a { color:#F6931E; text-decoration:none; }
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-top { height:10px; }
.wrapper-bottom { height:6px; }
.wrapper-middle { min-height:389px; background-color:#FDFDFD0; }
.logo { }
.credits-content { padding:160px 20px 20px 20px; background:url(".e_IMAGE_ABS."admin_images/credits_logo.png) no-repeat 50% 30px; }
.copyright { text-align:center; margin-top:30px}
";
$e_sub_cat = 'credits';
include(e_ADMIN.'ver.php');
e107::css('inline',$css);
$creditsArray = array(
array( "name" => "MagpieRSS",
"url" => "http://magpierss.sourceforge.net/",
"description" => CRELAN_10,
"version" => "0.71.1",
"licence" => "GPL, ".CRELAN_8
),
array( "name" => "PCLZip",
"url" => "http://www.phpconcept.net/pclzip/",
"description" => CRELAN_11,
"version" => "2.3",
"licence" => "GPL"
),
array( "name" => "PCLTar",
"url" => "http://www.phpconcept.net/pcltar/",
"description" => CRELAN_12,
"version" => "1.3",
"licence" => "GPL"
),
array( "name" => "TinyMCE",
"url" => "http://tinymce.moxiecode.com/",
"description" => CRELAN_13,
"version" => "2.08",
"licence" => "GPL"
),
array( "name" => "Nuvolo Icons",
"url" => "http://www.icon-king.com",
"description" => CRELAN_14,
"version" => "1.0",
"licence" => "GPL"
),
array( "name" => "PHPMailer",
"url" => "http://phpmailer.sourceforge.net/",
"description" => CRELAN_15,
"version" => "1.72",
"licence" => "GPL"
),
array( "name" => "Brainjar DHTML Menu",
"url" => "http://www.brainjar.com/dhtml/menubar/",
"description" => CRELAN_16,
"version" => "0.1",
"licence" => "GPL, ".CRELAN_8
),
array( "name" => "FPDF",
"url" => "http://www.fpdf.org/",
"description" => CRELAN_18,
"version" => "1.53",
"licence" => "Freeware"
),
array( "name" => "UFPDF",
"url" => "http://www.acko.net/node/56",
"description" => CRELAN_19,
"version" => "0.1",
"licence" => "GPL"
),
);
$contentA = array( // ORDER BY FirstName ASC ;)
"<h3>".CRELAN_6."<\/h3>",
"<h1>Cameron Hanly<\/h1>[ CaMer0n ]<br /><br /><br />".CRELAN_21,
"<h1>Carl Cedergren<\/h1>[ asperon ]<br /><br /><br />".CRELAN_20,
"<h1>Eric Vanderfeesten<\/h1> [ lisa ]<br /><br /><br />".CRELAN_23,
"<h1>James Currie<\/h1>[ SweetAs ]<br /><br /><br />".CRELAN_27,
"<h1>Martin Nicholls<\/h1>[ streaky ]<br /><br /><br />".CRELAN_26,
"<h1>Miroslav Yovchev<\/h1>[ SecretR ]<br /><br /><br />".defset('CRELAN_29'),
"<h1>Pete Holzmann<\/h1>[ MrPete ]<br /><br /><br />".CRELAN_28,
"<h1>Steve Dunstan<\/h1>[ jalist ]<br /><br /><br />".CRELAN_22,
"<h1>Steven Davies<\/h1>[ steved ]<br /><br /><br />".defset('CRELAN_30'),
"<h1>Thom Michelbrink<\/h1>[ McFly ]<br /><br /><br />".CRELAN_24,
"<h1>William Moffett<\/h1>[ que ]<br /><br /><br />".CRELAN_25,
);
echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>".PAGE_NAME."</title>
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
<meta http-equiv='content-style-type' content='text/css' />
<link rel='stylesheet' href='".THEME."style.css' type='text/css' />
</head>
<body style='padding: 0; margin: 0; background-color: #e8e8e8; color: #8E8E8E'>
<div><img src='".e_IMAGE."generic/cred.png' alt='' />
<div class='smalltext' style='position: absolute; top: 120px; left: 118px;'><b>".CRELAN_7." ".$e107info['e107_version'].", build ".($e107info['e107_build'] ? $e107info['e107_build'] : "zero")."</b><br />&copy; 2002-2008, ".CRELAN_3."</div>
";
require_once(e_ADMIN."auth.php");
$fadejs = "
<script type='text/javascript'>
<!--
$text ='<div class="wrapper">
<div class="wrapper-middle">
<div class="credits-content">
<h1>v2+ Developers</h1>
<p>
Cameron Hanly, Miroslav Yovchev, Steven Davies,<br />
Henk Jongedijk, James Currie, Martin Nicholls,<br />
Steven Davies, Thom Michelbrink
</p>
<h1>3rd Parties</h1>
<p>
Twitter Bootstrap, MagpieRSS, PCLZip, PCLTar, TinyMCE,<br />
Nuvolo Icons, PHPMailer, FPDF, UFPDF, PHP UTF8
</p>
<div class="copyright">Copyright <a href="http://e107.org/content/About-Us:The-Team" title="e107 Team">e107 Inc.</a> 2008-2012</div>
</div>
</div>
</div>';
var delay = 2000;
var maxsteps=30;
var stepdelay=40;
var startcolor= new Array(255,255,255);
var endcolor=new Array(0,0,0);
var fcontent=new Array();
";
$ns->tablerender("",$text);
if(e_QUERY && e_QUERY == "stps")
{
$count=1;
$fadejs .= "fcontent[0] = '<br /><br />".CRELAN_2."';";
foreach($creditsArray as $credits)
{
extract($credits);
$fadejs .= "fcontent[$count] = '<br /><br /><h1>$name<\/h1>".CRELAN_7." $version<br /><br />$description<br /><br />[ <a href=\"$url\" rel=\"external\">$url<\/a> ]<br /><br />".CRELAN_9." - $licence';
";
$count++;
}
}
else
{
$count=0;
foreach($contentA as $content)
{
$fadejs .= "fcontent[$count] = '<br /><br />$content';
";
$count++;
}
}
require_once(e_ADMIN."footer.php");
$fadejs .= <<<TEXT
begintag='';
closetag='';
exit;
var fadelinks=1;
var fwidth='95%';
var fheight='220px;'
///No need to edit below this line/////////////////
var ie4=document.all&&!document.getElementById;
var DOM2=document.getElementById;
var faderdelay=0;
var index=0;
/*Rafael Raposo edited function*/
//function to change content
function changecontent(){
if (index>=fcontent.length)
index=0
if (DOM2){
document.getElementById("fscroller").style.color="rgb("+startcolor[0]+", "+startcolor[1]+", "+startcolor[2]+")"
document.getElementById("fscroller").innerHTML=begintag+fcontent[index]+closetag
if (fadelinks)
linkcolorchange(1);
colorfade(1, 15);
}
else if (ie4)
document.all.fscroller.innerHTML=begintag+fcontent[index]+closetag;
index++
}
// colorfade() partially by Marcio Galli for Netscape Communications. ////////////
// Modified by Dynamicdrive.com
function linkcolorchange(step){
var obj=document.getElementById("fscroller").getElementsByTagName("A");
if (obj.length>0){
for (i=0;i<obj.length;i++)
obj[i].style.color=getstepcolor(step);
}
}
/*Rafael Raposo edited function*/
var fadecounter;
function colorfade(step) {
if(step<=maxsteps) {
document.getElementById("fscroller").style.color=getstepcolor(step);
if (fadelinks)
linkcolorchange(step);
step++;
fadecounter=setTimeout("colorfade("+step+")",stepdelay);
}else{
clearTimeout(fadecounter);
document.getElementById("fscroller").style.color="rgb("+endcolor[0]+", "+endcolor[1]+", "+endcolor[2]+")";
setTimeout("changecontent()", delay);
}
}
/*Rafael Raposo's new function*/
function getstepcolor(step) {
var diff
var newcolor=new Array(3);
for(var i=0;i<3;i++) {
diff = (startcolor[i]-endcolor[i]);
if(diff > 0) {
newcolor[i] = startcolor[i]-(Math.round((diff/maxsteps))*step);
} else {
newcolor[i] = startcolor[i]+(Math.round((Math.abs(diff)/maxsteps))*step);
}
}
return ("rgb(" + newcolor[0] + ", " + newcolor[1] + ", " + newcolor[2] + ")");
}
if (ie4||DOM2)
document.write('<div id="fscroller" style="text-align: center; width:'+fwidth+';height:'+fheight+'"><\/div>');
if (window.addEventListener)
window.addEventListener("load", changecontent, false)
else if (window.attachEvent)
window.attachEvent("onload", changecontent)
else if (document.getElementById)
window.onload=changecontent;
//-->
</script>
TEXT;
echo $fadejs;
echo "
<div style='text-align: center; margin-left: auto; margin-right: auto;'>
<form method='get' action=''><div>".
(e_QUERY && e_QUERY == "stps" ? "<input class='tbox' type='button' onclick=\"self.parent.location='".e_ADMIN."credits.php'\" value='".CRELAN_4."' />" : "<input class='tbox' type='button' onclick=\"self.parent.location='".e_ADMIN."credits.php?stps'\" value='".CRELAN_5."' />")."</div>
</form>
</div>
</div>
</body>
</html>
";
?>

5
e107_admin/db.php
View File

@ -75,6 +75,8 @@ if(isset($_POST['exportXmlFile']))
}
require_once ("auth.php");
$st = new system_tools;
@ -956,10 +958,11 @@ class system_tools
//XXX - what is this for (backup core)? <input type='hidden' name='sqltext' value='{$sqltext}' />
function db_adminmenu()
function db_adminmenu() //FIXME - has problems when navigation is on the LEFT instead of the right.
{
global $st;
foreach($st->_options as $key=>$val)
{
$var[$key]['text'] = $val['label'];

2
e107_admin/emoticon.php
View File

@ -234,7 +234,7 @@ class emotec
$text .= $frm->admin_button('subPack_'.$pack,'edit','submit',EMOLAN_12);
$text .= $frm->admin_button('subPack_'.$pack,'edit','submit',LAN_CONFIGURE);
if ($can_scan && ($pack != 'default'))
{

27
e107_admin/includes/infopanel.php
View File

@ -222,25 +222,32 @@ function render_infopanel_options($render = false)
// $frm = e107::getSingleton('e_form');
$frm = e107::getForm();
$mes = e107::getMessage();
$ns = e107::getRender();
$start = "<div>
To customize this page, please <a title = 'Customize Admin' href='".e_SELF."?mode=customize&amp;iframe=1' class='e-modal-iframe'>click here</a>.
</div>
";
if($render == false){ return $start; }
if($render == false){ return ""; }
$text2 = "<div id='customize_icons' class='forumheader3' style='border:0px;margin:0px'>
<form method='post' 'id='e-modal-form' action='".e_SELF."?".e_QUERY."'>
<h2>Icons</h2>";
$text2 .= render_infopanel_icons();
<form method='post' id='e-modal-form' action='".e_SELF."'>";
$text2 .= $ns->tablerender("Personalize Icons",render_infopanel_icons(),'personalize',true);
$text2 .= "<div class='clear'>&nbsp;</div>";
$text2 .= "<h2>Menus</h2>";
$text2 .= render_infopanel_menu_options();
$text2 .= $ns->tablerender("Personalize Menus",render_infopanel_menu_options(),'personalize',true);
// $text2 .= render_infopanel_icons();
//$text2 .= "<div class='clear'>&nbsp;</div>";
// $text2 .= "<h3>Menus</h3>";
// $text2 .= render_infopanel_menu_options();
$text2 .= "<div class='clear'>&nbsp;</div>";
$text2 .= "<div id='button' class='buttons-bar center'>";
$text2 .= $frm->admin_button('submit-mye107', 'Save', 'Save');
$text2 .= "</div></form></div>";
$end = "</div>";
$text2 .= $frm->admin_button('submit-mye107', 'Save', 'create');
$text2 .= "</div></form>";
// $text2 .= "</div>";
// $end = "</div>";
return $mes->render().$text2.$end;
@ -276,6 +283,7 @@ function render_infopanel_icons()
}
}
}
$text .= "<div class='clear'>&nbsp;</div>";
return $text;
}
@ -308,6 +316,7 @@ function render_infopanel_menu_options()
}
}
}
$text .= "<div class='clear'>&nbsp;</div>";
return $text;
}
?>

7
e107_admin/language.php
View File

@ -749,7 +749,10 @@ function available_langpacks()
function language_adminmenu()
{
global $action,$pref;
global $pref;
$action = e_QUERY;
if ($action == "")
{
$action = "main";
@ -758,8 +761,10 @@ function language_adminmenu()
{
$action = "db";
}
$var['main']['text'] = LAN_PREFS;
$var['main']['link'] = e_SELF;
if (isset($pref['multilanguage']) && $pref['multilanguage'])
{
$var['db']['text'] = LANG_LAN_03;

1
e107_admin/prefs.php
View File

@ -1688,6 +1688,7 @@ function prefs_adminmenu()
$var['core-prefs-uploads']['text'] = "File Uploading"; // TODO LAN
$var['core-prefs-javascript']['text'] = "Javascript Framework"; // TODO LAN
$var['core-prefs-advanced']['text'] = PRFLAN_149;
e_admin_menu(LAN_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var);
}

16
e107_admin/users.php
View File

@ -3134,15 +3134,13 @@ function showRanks()
<td><input class='tbox e-spinner' type='text' size='5' name='new_calc_lower' value='' /></td>
<td><input type='checkbox' name='new_calc_pfx' value='1' /></td>
<td>".RankImageDropdown($imageList,'new_calc_img')."</td>
</tr>
<tr>
<td colspan='5' style='text-align:center'>
<br />
<input type='submit' name='updateRanks' value='".USRLAN_215."' />
</td>
</tr>
";
$text .= '</table></form>';
</tr>";
$text .= '</table>
<div class="buttons-bar center">
'.$frm->admin_button('updateRanks','no-value','submit',USRLAN_215).'
</div>
</form>';
echo $emessage->render().$text;

23
e107_admin/users_extended.php
View File

@ -34,15 +34,20 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
$e_sub_cat = 'user_extended';
$curtype = '1';
require_once(e_HANDLER.'message_handler.php');
require_once("auth.php");
require_once(e_HANDLER.'user_extended_class.php');
require_once(e_HANDLER.'userclass_class.php');
require_once(e_HANDLER.'message_handler.php');
$ue = new e107_user_extended;
$user = new users_ext;
$frm = e107::getForm();
$ue = new e107_user_extended;
require_once(e_HANDLER.'user_extended_class.php');
require_once(e_HANDLER.'userclass_class.php');
$message = '';
@ -123,7 +128,7 @@ if (isset($_POST['catdown_x']) || isset($_POST['catdown']))
}
}
$user = new users_ext;
if (isset($_POST['add_field']))
{
@ -1212,7 +1217,11 @@ class users_ext
function users_extended_adminmenu() {
global $user, $action, $ns, $curtype, $action;
$user->show_options($action);
// $user->show_options($action);
$ac = e_QUERY;
$action = vartrue($ac,'main');
users_ext::show_options($action);
if($action == 'editext' || $action == 'continue')
{
$ns->tablerender(EXTLAN_46." - <span id='ue_type'>&nbsp;</span>", "<div id='ue_help'>&nbsp;</div>");

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

@ -1443,14 +1443,7 @@ class admin_shortcodes
}
elseif($type == 'logout')
{
$tmp[0]['text'] = ADLAN_46;
$tmp[0]['description'] = ADLAN_151;
$tmp[0]['link'] = e_ADMIN_ABS.'admin.php?logout';
$tmp[0]['image'] = "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[0]['image_large'] = '';
$tmp[0]['image_src'] = '';
$tmp[0]['image_large_src'] = '';
$tmp[0]['perm'] = '';
$tmp = array();
$tmp[1]['text'] = ADLAN_CL_1;
$tmp[1]['description'] = ADLAN_151;
@ -1461,6 +1454,25 @@ class admin_shortcodes
$tmp[1]['image_large_src'] = '';
$tmp[1]['perm'] = '';
$tmp[2]['text'] = "Personalize"; // TODO - generic LAN in lan_admin.php
$tmp[2]['description'] = "Customize administration panels";
$tmp[2]['link'] = e_ADMIN.'admin.php?mode=customize';
$tmp[2]['image'] = E_16_ADMIN; // "<img src='".E_16_NAV_ADMIN."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[2]['image_large'] = '';
$tmp[2]['image_src'] = '';
$tmp[2]['image_large_src'] = '';
$tmp[2]['perm'] = '';
$tmp[3]['text'] = ADLAN_46;
$tmp[3]['description'] = ADLAN_151;
$tmp[3]['link'] = e_ADMIN_ABS.'admin.php?logout';
$tmp[3]['image'] = "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[3]['image_large'] = '';
$tmp[3]['image_src'] = '';
$tmp[3]['image_large_src'] = '';
$tmp[3]['perm'] = '';
$menu_vars['logout']['text'] = ADMINNAME;
$menu_vars['logout']['link'] = '#';

BIN
e107_images/admin_images/credits_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

19
e107_themes/bootstrap/admin_style.css
View File

@ -6,9 +6,17 @@
padding:10px;
}
.navbar {
background-color: #081D28;
}
#core-infopanel_mye107 a {
}
.tipsy-inner {
font-size:15px;
}
/* Core Formatting */
.left { text-align: left }
@ -87,7 +95,16 @@ img.edit,
img.delete,
input.delete { }
.buttons-bar { padding: 10px 0px; background-color: #d0fbfd; }
.buttons-bar { padding: 10px 0px; }
i.icon-chevron-right {
float:right;
opacity: 0.3
}
a.link-active i {
opacity: 1.0;
}
/*******************************************************************************************************************/
/* Admin List Table */
.adminlist, .adminform { width:100%; border:1px solid #ddd;}

14
e107_themes/bootstrap/admin_template.php
View File

@ -52,7 +52,7 @@ $E_ADMIN_NAVIGATION['button_active'] = '
$E_ADMIN_NAVIGATION['button_other'] = '
<li>
<a role="button" href="{LINK_URL}" >
<i class="icon-home icon-white"></i> {LINK_TEXT}
{LINK_TEXT}
</a>
</li>
';
@ -90,10 +90,8 @@ $E_ADMIN_NAVIGATION['end'] = '</ul>';
$ADMIN_HEADER = '<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="brand" href="#"><img src="'.e_IMAGE_ABS.'e107_icon_32.png" alt="e107" /> e107 Admin</a>
<div class="container-fluid">
<a class="brand" href="'.e_ADMIN_ABS.'admin.php"><img src="'.THEME.'img/e107_adminlogo.png" alt="e107" /></a>
<div class="nav-collapse collapse">
<div class="dropdown nav pull-right navbar-text ">
@ -170,7 +168,7 @@ $ADMIN_FOOTER = '
<hr>
<footer>
{ADMIN_CREDITS}
Copyright &copy; 2008-2012 e107 Inc (e107.org)<br />
</footer>
</div><!--/.fluid-container-->';
@ -273,13 +271,13 @@ $E_ADMIN_MENU['start'] = '
$E_ADMIN_MENU['button'] = '
<li>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}</a>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="icon-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_MENU['button_active'] = '
<li class="active">
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}</a>
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="icon-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
{SUB_MENU}
</li>
';

15
e107_themes/bootstrap/admin_theme.php
View File

@ -4,7 +4,6 @@ if ( ! defined('e107_INIT')) { exit(); }
define('STANDARDS_MODE', TRUE);
// include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
e107::js('theme','js/bootstrap.js');
e107::css('theme','css/bootstrap.css');
e107::css('theme','css/bootstrap-responsive.css');
@ -124,6 +123,19 @@ function tablestyle($caption, $text, $mode)
';
return;
}
if($mode == 'personalize')
{
echo '<div class="well" style="padding:10px">
<div class="nav-header">'.$caption.'</div>
'.$text.'
</div>';
return;
}
if($style == 'core-infopanel')
{
@ -142,7 +154,6 @@ function tablestyle($caption, $text, $mode)
switch(varset($style, 'admin_content')) {
case 'admin_menu' :

BIN
e107_themes/bootstrap/img/e107_adminlogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

1
e107_web/js/core/admin.jquery.js
View File

@ -102,6 +102,7 @@ $(document).ready(function()
$(id).show({
effect: "slide"
});
return false; //FIXME See admin/prefs navigation.
});