diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index d0a7d93fb..54c35c8b2 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -349,7 +349,7 @@ switch ($action) // @todo format form the 0.8 way $text = "
- +
diff --git a/e107_admin/modcomment.php b/e107_admin/modcomment.php index 8bfeb95e0..6aa517660 100644 --- a/e107_admin/modcomment.php +++ b/e107_admin/modcomment.php @@ -83,9 +83,8 @@ if (isset($message)) { } $text = " -
-
"; +
"; if ($editid) { @@ -160,10 +159,12 @@ else ".$comments." - + "; } -$text .= "
".MDCLAN_12." (".$total_comments." ".($total_comments == "1" ? MDCLAN_11 : MDCLAN_12).", ".$total_blocked." ".MDCLAN_13.")
".MDCLAN_9."
+ +
"; +$text .= ""; $ns->tablerender(MDCLAN_8, $text); diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index 84843ec84..c6522e2ef 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -756,7 +756,7 @@ $ns->tablerender(UCSLAN_21, $text); $db_status = $e_userclass->update_db(TRUE) ? "Updated" : "Original"; $text = "
- +
"; $text .= ""; $text .= ""; diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php index ccdbf9c5a..f9c21fe43 100644 --- a/e107_plugins/download/includes/admin.php +++ b/e107_plugins/download/includes/admin.php @@ -628,7 +628,7 @@ $columnInfo = array(
-
Test Functions and Information
DB Status: ".$db_status."
First required step
+
".DOWLAN_13." @@ -681,7 +681,7 @@ $columnInfo = array(
- +
".DOWLAN_149." @@ -697,7 +697,7 @@ $columnInfo = array(
- +
".DOWLAN_128." "; diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php index b284ac6e9..fb48d1cff 100644 --- a/e107_plugins/log/admin_config.php +++ b/e107_plugins/log/admin_config.php @@ -33,6 +33,7 @@ if (!getperms('P') || !e107::isInstalled('log')) require_once(e_ADMIN.'auth.php'); require_once(e_HANDLER.'userclass_class.php'); +$frm = e107::getForm(); define('LOGPATH', e_PLUGIN.'log/'); @@ -287,43 +288,43 @@ switch ($action) case 'config' : $text = "
- +
- - + - - + + - - + - - + - - + - - + - - + - - + "; $text .= " - -
".ADSTAT_L4." + ".ADSTAT_L4." ".ADSTAT_ON."   ".ADSTAT_OFF."
".ADSTAT_L18."".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."".ADSTAT_L18."".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."
".ADSTAT_L20." + ".ADSTAT_L20." ".ADSTAT_ON."   ".ADSTAT_OFF."
".ADSTAT_L21." + ".ADSTAT_L21."
".ADSTAT_L5." + ".ADSTAT_L5." ".gen_select(ADSTAT_L6, 'statBrowser',$pref['statBrowser']) .gen_select(ADSTAT_L7, 'statOs',$pref['statOs']) .gen_select(ADSTAT_L8, 'statScreen',$pref['statScreen']) @@ -338,14 +339,14 @@ switch ($action)
".ADSTAT_L78."
".ADSTAT_L79."		 + ".ADSTAT_L78."
".ADSTAT_L79."
".ADSTAT_L12."
".ADSTAT_L13."		 + ".ADSTAT_L12."
".ADSTAT_L13."		 ".ADSTAT_L14."
".ADSTAT_L6."
".ADSTAT_L7."
@@ -358,19 +359,18 @@ switch ($action)
".ADSTAT_L26."
".ADSTAT_L27."		 + ".ADSTAT_L26."
".ADSTAT_L27."
- -
+
+ ".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')." +
"; @@ -396,7 +396,7 @@ switch ($action) { $text .= "
"; } - $text .= " + $text .= "
@@ -405,18 +405,18 @@ switch ($action) if ($action == 'export') { - $text .= ""; + $text .= ""; } else { - $text .= ""; + $text .= ""; } // Type of output data - page data, browser stats.... - $text .= "'; + $text .= "'; // Period selection type for page data - $text .= ""; $text .= " - - + "; } @@ -501,9 +502,9 @@ switch ($action) if ($export_filter) { - if (getperms('0')) $text .= ""; + if (getperms('0')) $text .= ""; $sql -> db_Select("logstats", "log_id", "{$export_filter} "); - $text .= " - -
".ADSTAT_L67."
".ADSTAT_L67."
".ADSTAT_L68."
".ADSTAT_L68."
".ADSTAT_L51."\n".data_type_select('export_type',$export_type).'
".ADSTAT_L51."\n".data_type_select('export_type',$export_type).'
".ADSTAT_L41."\n + $text .= "
".ADSTAT_L41."\n
".ADSTAT_L46."\n"; + $text .= "
".ADSTAT_L46."\n"; // Now put the various dropdowns - their visibility is controlled by the export_type dropdown @@ -475,7 +475,7 @@ switch ($action) if ($action == 'export') { // Separators, quotes - $text .= "
".ADSTAT_L59."\n + $text .= "
".ADSTAT_L59."\n \n
".ADSTAT_L60."
".ADSTAT_L61."		 + ".ADSTAT_L60."
 + ".ADSTAT_L61."
".ADSTAT_L65."".$export_filter."
".ADSTAT_L65."".$export_filter."
".ADSTAT_L64.""; + $text .= "
".ADSTAT_L64.""; while($row = $sql -> db_Fetch()) { $text .= $row['log_id']."
"; @@ -512,12 +513,10 @@ switch ($action) } $text .= " -
- -
+
+ ".$frm->admin_button('create_export', ($action == 'export' ? ADSTAT_L37 : ADSTAT_L66), 'update')." +
"; @@ -533,7 +532,7 @@ switch ($action) //=========================================================== $text = "
- +
@@ -542,57 +541,59 @@ switch ($action) $keep_year = varset($_POST['delete_year'],0); if (isset($_POST['delete_history'])) { - $text .= " + $text .= ""; - $text .= ""; + $text .= ""; } else { if (isset($_POST['actually_delete'])) { - $delete_list = get_for_delete($keep_year,$keep_month); - $logStr = ''; -// $text .= ""; - $text .= ""; - $admin_log->log_event('STAT_04',ADSTAT_L83.$logStr,''); - } - $text .= ""; - $text .= " - - - "; + $delete_list = get_for_delete($keep_year,$keep_month); + $logStr = ''; + // $text .= ""; + $text .= ""; + $admin_log->log_event('STAT_04',ADSTAT_L83.$logStr,''); + } + $text .= ""; + $text .= ""; } - $text .= "
".ADSTAT_L72."".nl_langinfo(constant('MON_'.$keep_month))." ".$keep_year."
".ADSTAT_L72."".nl_langinfo(constant('MON_'.$keep_month))." ".$keep_year."

".ADSTAT_L74."
".ADSTAT_L75."".implode("
",get_for_delete($keep_year,$keep_month))."
".ADSTAT_L75."".implode("
",get_for_delete($keep_year,$keep_month))."
Data notionally deleted {$keep_month}-{$keep_year}
".ADSTAT_L77.""; - foreach ($delete_list as $k => $v) - { - $sql->db_Delete('logstats',"log_id='{$k}'"); - $text .= $v."
"; - $logStr .= "[!br!]{$k} => ".$v; - } - $text .= "
".ADSTAT_L70."\n   "; - - $this_year = date("Y"); - $text .= "\n
- -
".ADSTAT_L76." -
Data notionally deleted {$keep_month}-{$keep_year}
".ADSTAT_L77.""; + foreach ($delete_list as $k => $v) + { + $sql->db_Delete('logstats',"log_id='{$k}'"); + $text .= $v."
"; + $logStr .= "[!br!]{$k} => ".$v; + } + $text .= "
".ADSTAT_L70."\n   "; + + $this_year = date("Y"); + $text .= "\n
"; + + $text .= "
+ +
+ ".$frm->admin_button('delete_history',LAN_DELETE,'delete')." + ".ADSTAT_L76." +
+ +
"; $ns->tablerender(ADSTAT_L69, $text); break; // case 'history' @@ -730,7 +731,9 @@ function get_for_delete($keep_year,$keep_month = 1, $filter='*') //--------------------------------------------- function rempage() { - global $sql, $ns; + $sql = e107::getDb(); + $ns = e107::getRender(); + $frm = e107::getForm(); $logfile = e_LOG."logp_".date("z.Y", time()).".php"; // $logfile = e_PLUGIN."log/logs/logp_".date("z.Y", time()).".php"; @@ -749,14 +752,14 @@ function rempage() $pageTotal[$url]['unqv'] += $tmpcon['unq']; } - $text = "
+ $text = "
- +
- + "; @@ -764,23 +767,19 @@ function rempage() { $text .= " - - - + + + "; } $text .= " - - - - -
".ADSTAT_L29." URL".ADSTAT_L30." ...".ADSTAT_L30." ...
{$key}".$page['url']."{$key}".$page['url']."
-
+
+ ".$frm->admin_button('remSelP', ADSTAT_L31, 'delete')." -
+ "; $ns -> tablerender(ADSTAT_L32, $text); diff --git a/e107_themes/bootstrap/style.css b/e107_themes/bootstrap/style.css index c4958d43e..c23448957 100644 --- a/e107_themes/bootstrap/style.css +++ b/e107_themes/bootstrap/style.css @@ -1,3 +1,6 @@ +/* */ +body { padding-top: 75px; padding-bottom: 40px; } +.well { padding:10px; } /* E107 CORE CSS *********************************************************************************************/ .searchhighlight{text-decoration: underline; color:#FF0000; font-weight:bold; } diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php index bf0f46e20..0b9d976e4 100644 --- a/e107_themes/bootstrap/theme.php +++ b/e107_themes/bootstrap/theme.php @@ -103,52 +103,42 @@ function tablestyle($caption, $text, $mod) } $HEADER['default'] = ' -
-
-
- BLANK HEADER -
-
-
- -
-
-
-
- - - - - - - - -
- {SETSTYLE=menu} - {MENU=1} - -
-
- {SETSTYLE=content} - {FEATUREBOX|default=notablestyle} - {FEATUREBOX|dynamic=notablestyle} +
+
+
+ {SITELOGO} +
+
+ {CUSTOM=login} +
+ +
+ {SITELINKS} +
+
+
+
+
+
+
+ {SETSTYLE=site_info} + + {MENU=2} + +
+
'; $FOOTER['default'] = ' - {FEATUREBOX|tabs=notablestyle&cols='.e107::getThemePref('fb_tabs_cols', 1).'} -
-
-
-
- {SETSTYLE=menu} - {MENU=2} -
-
-
-
- -
-
-'; +
+ + +
+ + + + '; $HEADER['alternate'] = ''; $FOOTER['alternate'] = ''; diff --git a/e107_themes/bootstrap/theme.xml b/e107_themes/bootstrap/theme.xml index 544156896..e92942e17 100644 --- a/e107_themes/bootstrap/theme.xml +++ b/e107_themes/bootstrap/theme.xml @@ -3,7 +3,7 @@ Bootstrap e107 admin theme - + usersettings.php