diff --git a/class2.php b/class2.php index 2a9d5edfe..4570c3f6e 100644 --- a/class2.php +++ b/class2.php @@ -1087,6 +1087,10 @@ if(e_ADMIN_AREA) else { require_once (THEME.'theme.php'); + if(isset($SC_WRAPPER)) + { + e107::scStyle($SC_WRAPPER); + } } diff --git a/e107.robots.txt b/e107.robots.txt index 808bf0bab..4927f60c1 100644 --- a/e107.robots.txt +++ b/e107.robots.txt @@ -1,6 +1,16 @@ User-agent: * Disallow: /sitedown.php +Disallow: /cron.php +Disallow: /fpw.php +Disallow: /membersonly.php Disallow: /e107_admin/ -Disallow: /e107_handlers/ +Disallow: /e107_core/ +Disallow: /e107_docs/ Disallow: /e107_files/cache/ Disallow: /e107_files/public/avatars/ +Disallow: /e107_handlers/ +Disallow: /e107_languages/ +Disallow: /e107_media/ +Disallow: /e107_system/ +Disallow: /e107_themes/ +Disallow: /e107_web/ diff --git a/e107_admin/image.php b/e107_admin/image.php index 1de4d1678..35ed24b8e 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -668,7 +668,7 @@ class media_admin_ui extends e_admin_ui 'media_dimensions' => array('title'=> "Dimensions", 'type' => 'text', 'data'=> 'str', 'width' => '5%', 'readonly'=>TRUE, 'class'=>'nowrap','noedit'=>TRUE), 'media_userclass' => array('title'=> LAN_USERCLASS, 'type' => 'userclass', 'data'=> 'str', 'inline'=>true, 'width' => '10%', 'thclass' => 'center','filter'=>TRUE,'batch'=>TRUE ), 'media_tags' => array('title'=> "Tags/Keywords", 'type' => 'tags', 'data'=> 'str', 'width' => '10%', 'filter'=>TRUE,'batch'=>TRUE ), - 'media_usedby' => array('title'=> '', 'type' => 'text', 'data'=> 'text', 'width' => 'auto', 'thclass' => 'center', 'class'=>'center', 'nolist'=>true, 'readonly'=>TRUE ), + 'media_usedby' => array('title'=> 'Used by', 'type' => '', 'data'=> 'text', 'width' => 'auto', 'thclass' => 'center', 'class'=>'center', 'nolist'=>true, 'readonly'=>TRUE ), 'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'data'=> null, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center', 'batch'=>true, 'noedit'=>true) ); diff --git a/e107_admin/links.php b/e107_admin/links.php index 7e465b2e4..a32a330f8 100644 --- a/e107_admin/links.php +++ b/e107_admin/links.php @@ -492,7 +492,6 @@ class links_model_admin_tree extends e_admin_tree_model { $search[$model->get('link_parent')][$id] = $model; } - asort($search); $this->_tree_order($this->current_id, $search, $this->$var, 0, $modified); } @@ -522,11 +521,27 @@ class links_model_admin_tree extends e_admin_tree_model $src[$id] = $model; if($modified) { - $model->set('link_name', $level_image.$model->get('link_name')); + $model->set('link_name', $level_image.$this->bcClean($model->get('link_name'))); } $this->_tree_order($id, $search, $src, $level + 1, $modified); } } + + + function bcClean($link_name) + { + if(substr($link_name, 0,8) == 'submenu.') // BC Fix. + { + list($tmp,$tmp2,$link) = explode('.', $link_name, 3); + } + else + { + $link = $link_name; + } + + return $link; + } + } diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 9c6be3aed..8267c952b 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -27,11 +27,10 @@ if(e_AJAX_REQUEST && isset($_GET['src'])) // Ajax $localfile = md5($remotefile.time()).".zip"; $status = "Downloading..."; -// e107::getFile()->getRemoteFile($remotefile,$localfile); - - e107::getFile()->download($remotefile,'plugin'); - - + $fl = e107::getFile(); + //$fl->setAuthKey('username','password'); + $fl->download($remotefile,'plugin'); + exit; /* @@ -265,14 +264,13 @@ class pluginManager{ "plugin_icon" => array("title" => EPL_ADLAN_82, "type"=>"icon", "width" => "5%", "thclass" => "middle center",'class'=>'center', "url" => ""), "plugin_name" => array("title" => EPL_ADLAN_10, 'forced'=>true, "type"=>"text", "width" => "auto", 'class'=>'left', "thclass" => "middle", "url" => ""), "plugin_version" => array("title" => EPL_ADLAN_11, "type"=>"numeric", "width" => "5%", "thclass" => "middle", "url" => ""), - "plugin_date" => array("title" => "Released ", "type"=>"text", "width" => "10%", "thclass" => "middle"), + "plugin_date" => array("title" => "Released ", "type"=>"text", "width" => "8%", "thclass" => "middle"), "plugin_folder" => array("title" => EPL_ADLAN_64, "type"=>"text", "width" => "10%", "thclass" => "middle"), "plugin_category" => array("title" => LAN_CATEGORY, "type"=>"text", "width" => "auto", "thclass" => "middle"), "plugin_author" => array("title" => EPL_ADLAN_12, "type"=>"text", "width" => "10%", "thclass" => "middle"), - // "plugin_website" => array("title" => EPL_WEBSITE, "type"=>"method", "width" => "5%", "thclass" => "middle center"), - "plugin_compatible" => array("title" => EPL_ADLAN_13, "type"=>"text", "width" => "5%", "thclass" => "middle"), - + "plugin_price" => array("title" => "Price", 'nolist'=>true, "forced"=>true, "type"=>"text", "width" => "5%", "thclass" => "left"), + "plugin_compatible" => array("title" => EPL_ADLAN_13, "type"=>"text", "width" => "5%", "thclass" => "middle"), "plugin_description" => array("title" => EPL_ADLAN_14, "type"=>"bbarea", "width" => "30%", "thclass" => "middle center", 'readParms' => 'expand=1&truncate=180&bb=1'), "plugin_compliant" => array("title" => EPL_ADLAN_81, "type"=>"text", "width" => "5%", "thclass" => "middle center", "url" => ""), // "plugin_release" => array("title" => EPL_ADLAN_81, "type"=>"text", "width" => "5%", "thclass" => "middle center", "url" => ""), @@ -298,6 +296,11 @@ class pluginManager{ $this->action = $_GET['mode']; } + if($this->action == 'online') + { + $this->fields["plugin_price"]['nolist'] = false; // = array("title" => "Price", "forced"=>true, "type"=>"text", "width" => "5%", "thclass" => "middle center"); + } + $keys = array_keys($this -> titlearray); $this->pagetitle = (in_array($this->action,$keys)) ? $this -> titlearray[$this->action] : $this -> titlearray['installed']; @@ -343,9 +346,17 @@ class pluginManager{ $user_pref['admin_pluginmanager_columns'] = false; - $this -> fieldpref = (vartrue($user_pref['admin_pluginmanager_columns'])) ? $user_pref['admin_pluginmanager_columns'] : array("plugin_icon","plugin_name","plugin_version","plugin_date","plugin_description","plugin_category","plugin_compatible","plugin_author","plugin_website","plugin_notes"); + $this -> fieldpref = (vartrue($user_pref['admin_pluginmanager_columns'])) ? $user_pref['admin_pluginmanager_columns'] : array("plugin_icon","plugin_name","plugin_version","plugin_date","plugin_description","plugin_category","plugin_compatible","plugin_author","plugin_website","plugin_notes"); + foreach($this->fields as $key=>$val) + { + if($val['forced'] == true && substr($key,0,6)=='plugin') + { + $this->fieldpref[] = $key; + } + } + if($this->action == 'avail' || $this->action == 'installed') // Plugin Check is done during upgrade_routine. { @@ -465,13 +476,14 @@ class pluginManager{ { $row = $r['@attributes']; - $badge = $this->compatibilityLabel($row['compatibility']);; - $featured = ($row['featured']== 1) ? " Featured" : ''; + $badge = $this->compatibilityLabel($row['compatibility']);; + $featured = ($row['featured']== 1) ? " Featured" : ''; + $price = ($row['price'] > 0) ? "".$row['price']." credits" : "Free"; $data[] = array( 'plugin_id' => $c, 'plugin_icon' => vartrue($row['icon'],e_IMAGE."admin_images/plugins_32.png"), - 'plugin_name' => $row['name'].$featured, + 'plugin_name' => stripslashes($row['name']).$featured, 'plugin_folder' => $row['folder'], 'plugin_date' => vartrue($row['date']), 'plugin_category' => vartrue($r['category'][0]), @@ -482,8 +494,10 @@ class pluginManager{ 'plugin_website' => vartrue($row['authorUrl']), 'plugin_url' => $row['url'], - 'plugin_notes' => '' - ); + 'plugin_notes' => '', + 'plugin_price' => $price + ); + $c++; } @@ -498,7 +512,7 @@ class pluginManager{ $text = " -
+
".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."
diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 5d51f4254..829656ac9 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -42,7 +42,7 @@ e107::css("inline"," .admin-theme-options:hover { opacity:0.8; } -.admin-theme-title { font-size: 15px; overflow:hidden; padding-left:5px; white-space:no-wrap; width:200px; position:relative; top:-132px; } +.admin-theme-title { line-height: 18px; overflow:hidden; padding-left:5px; white-space:no-wrap; width:200px; position:relative; top:-132px; } .admin-theme-select {border:1px dotted silver;background-color:#DDDDDD;float:left } diff --git a/e107_core/shortcodes/single/navigation.php b/e107_core/shortcodes/single/navigation.php index 1f4e3fc5c..947ef1b1b 100644 --- a/e107_core/shortcodes/single/navigation.php +++ b/e107_core/shortcodes/single/navigation.php @@ -18,5 +18,6 @@ function navigation_shortcode($parm='') // $data = $nav->collection($category); return $nav->render($data, $template); + } \ No newline at end of file diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php index 4deff7c07..faffa62c5 100644 --- a/e107_core/templates/header_default.php +++ b/e107_core/templates/header_default.php @@ -625,7 +625,7 @@ if ($e107_popup != 1) { if(ADMIN) { - if(file_exists(e_BASE.'install.php')){ echo "

*** ".CORE_LAN4." ***
".CORE_LAN5."


"; } + if(file_exists(e_BASE.'install.php') || file_exists(e_BASE.'install_.php')){ echo "
*** ".CORE_LAN4." ***
".CORE_LAN5."
"; } } // Display Welcome Message when old method activated. diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 4c0f3891f..46514e039 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -153,7 +153,7 @@ class e_parse extends e_parser // text is user-entered (i.e. untrusted)'body' or 'bulk' text (e.g. custom page body, content body) 'USER_BODY' => array( - 'constants'=>'full', 'scripts' => FALSE + 'constants'=>'full', 'scripts' => FALSE, 'nostrip'=>FALSE ), // text is 'body' of email or similar - being sent 'off-site' so don't rely on server availability 'E_BODY' => @@ -538,7 +538,7 @@ class e_parse extends e_parser /** * Check for umatched 'dangerous' HTML tags * (these can destroy page layout where users are able to post HTML) - * + * @DEPRECATED * @param string $data * @param string $tagList - if empty, uses default list of input tags. Otherwise a CSV list of tags to check (any type) * @@ -597,7 +597,7 @@ class e_parse extends e_parser /** - * XXX TODO Remove this horrible thing which adds junk to a db. + * @DEPRECATED XXX TODO Remove this horrible thing which adds junk to a db. * Checks a string for potentially dangerous HTML tags, including malformed tags * */ @@ -666,7 +666,7 @@ class e_parse extends e_parser } - + // XXX REmove ME. private function modTag($match) { $ans = ''; @@ -1342,6 +1342,11 @@ class e_parse extends e_parser { $text = strip_tags($text); } + + if (MAGIC_QUOTES_GPC == TRUE) // precaution for badly saved data. + { + $text = stripslashes($text); + } // Make sure we have a valid count for word wrapping diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php index 35d0e2ecd..cfbcffae4 100644 --- a/e107_handlers/file_class.php +++ b/e107_handlers/file_class.php @@ -686,9 +686,9 @@ class e_file // Use e107.org login. - private function setAuthKey($username,$password) + public function setAuthKey($username,$password) { - $now = gmdate('y-m-d H:i'); + $now = gmdate('y-m-d H'); $this->authKey = sha1($username.md5($password).$now); return $this; @@ -724,7 +724,7 @@ class e_file // echo ""; $result = $this->getRemoteFile($remotefile,$localfile); - + if(!file_exists(e_TEMP.$localfile)) { $status = ADMIN_FALSE_ICON."
Download Manually"; @@ -741,13 +741,15 @@ class e_file else { $contents = file_get_contents(e_TEMP.$localfile); - if($contents == 'false') + if(strlen($contents) < 400) { - echo "
Authentication Error
"; - exit; + echo ""; + return; } } + + // chmod(e_PLUGIN,0777); chmod(e_TEMP.$localfile,0755); @@ -759,6 +761,8 @@ class e_file $destpath = ($type == 'theme') ? e_THEME : e_PLUGIN; $typeDiz = ucfirst($type); + + @copy(e_TEMP.$localfile,e_BACKUP.$dir.".zip"); // Make a Backup in the system folder. if($dir && is_dir($destpath.$dir)) @@ -770,12 +774,19 @@ class e_file exit; } + if($dir == '') + { + echo ""; + @unlink(e_TEMP.$localfile); + exit; + } + if(is_dir(e_TEMP.$dir)) { $status = "Unzipping..."; if(!rename(e_TEMP.$dir,$destpath.$dir)) { - $alert = $tp->toJS("Couldn't Move ".$typeDiz." to ".$typeDiz." Folder"); + $alert = $tp->toJS("Couldn't Move ".e_TEMP.$dir." to ".$destpath.$dir." Folder"); echo ""; @unlink(e_TEMP.$localfile); exit; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index d25e813a2..f9c11d607 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1308,10 +1308,10 @@ class e_form { - $text = '
+ $text = ' '.$this->text($name, $searchVal,20,'class=search-query').' -
'; + '; diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index f21ff7e03..7d2a0e49a 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -1371,7 +1371,10 @@ class e_navigation $sc = e107::getScBatch('navigation'); $sc->template = $template; - $ret = $template['start']; + $head = $template['start']; + $foot = $template['end']; + $ret = ""; + foreach ($data as $_data) { $sc->setVars($_data); @@ -1379,10 +1382,8 @@ class e_navigation $itemTmpl = count($_data['link_sub']) > 0 ? $template['item_submenu'.$active] : $template['item'.$active]; $ret .= e107::getParser()->parseTemplate($itemTmpl, TRUE); } - - $ret .= $template['end']; - - return $ret; + + return ($ret != '') ? $head.$ret.$foot : ''; } @@ -1499,7 +1500,21 @@ class navigation_shortcodes extends e_shortcode function sc_link_name($parm='') { - return e107::getParser()->toHtml($this->var['link_name'],false,'defs'); + if(!varset($this->var['link_name'])) + { + return; + } + + if(substr($this->var['link_name'],0,8) == 'submenu.') // BC Fix. + { + list($tmp,$tmp2,$link) = explode('.',$this->var['link_name'],3); + } + else + { + $link = $this->var['link_name']; + } + + return e107::getParser()->toHtml($link, false,'defs'); } function sc_link_parent($parm='') diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index b9c3f9205..4b4a00fb4 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -426,80 +426,34 @@ class themeHandler } } - function showThemes($mode = 'main') + + private function search($name, $searchVal, $submitName, $filterName='', $filterArray=false, $filterVal=false) { - global $pref; - $mes = e107::getMessage(); - $ns = e107::getRender(); - $tp = e107::getParser(); $frm = e107::getForm(); - $srch = preg_replace('/[^\w]/','', vartrue($_GET['srch'])); - echo "
"; + $text = ' + '.$frm->text($name, $searchVal,20,'class=search-query').' + + '; - if($mode == "main" || !$mode) // Show Main Configuration - { - foreach ($this->themeArray as $key=>$theme) - { - if($key == $pref['sitetheme']) - { - $text = $this->renderTheme(1, $theme); - } - } - echo "
\n"; - $ns->tablerender(TPVLAN_26.SEP.TPVLAN_33, $mes->render().$text); - } + // $text .= $this->admin_button($submitName,LAN_SEARCH,'search'); - // Show Admin Configuration - if($mode == "admin") - { - - foreach ($this->themeArray as $key=>$theme) - { - if($key == $pref['admintheme']) - { - $text = $this->renderTheme(2, $theme); - } - } - echo "\n"; - $ns->tablerender(TPVLAN_26.SEP.TPVLAN_34, $mes->render().$text); - } + return $text; - // Show Upload Form - if($mode == "upload") - { - $this->renderUploadForm(); - } - - // Show All Themes - if($mode == "choose") - { - - $text = ""; - foreach ($this->themeArray as $key=>$theme) - { - $text .= $this->renderTheme(FALSE, $theme); - // print_a($theme); - } - $text .= "
 
"; - echo "\n"; - $ns->tablerender(TPVLAN_26.SEP.TPVLAN_39, $mes->render().$text); - - - } - - - if($mode == "online") - { - $e107 = e107::getInstance(); - $xml = e107::getXml(); - $mes = e107::getMessage(); - - // $mes->addWarning("This area is experimental."); + } + + - $from = intval(varset($_GET['frm'])); - $limit = 18; - // $file = SITEURLBASE.e_PLUGIN_ABS."release/release.php"; // temporary testing + + function renderOnline($ajax=false) + { + $xml = e107::getXml(); + $mes = e107::getMessage(); + $frm = e107::getForm(); + $ns = e107::getRender(); + $from = intval(varset($_GET['frm'])); + $limit = 96; + $srch = preg_replace('/[^\w]/','', vartrue($_GET['srch'])); $file = "http://e107.org/feed?type=theme&frm=".$from."&srch=".$srch."&limit=".$limit; @@ -510,14 +464,9 @@ class themeHandler $xdata = $xml->loadXMLfile($file,true,false); $total = $xdata['@attributes']['total']; - $text = " - -
-
".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."
"; - $amount =$limit; - + /* if($total > $amount) { //$parms = $total.",".$amount.",".$from.",".e_SELF.'?mode='.$_GET['mode'].'&frm=[FROM]'; @@ -527,19 +476,30 @@ class themeHandler $text .= "
".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."
"; } - - $text .= "
"; + */ // print_a($xdata); - //TODO use admin_ui including filter capabilities by sending search queries back to the xml script. - // XML data array. $c = 1; - + $text = "\n"; } @@ -690,6 +755,7 @@ class themeHandler $preview = "".($theme['preview'] ? "" : "").""; $description = vartrue($theme['description'],''); $compat = (intval($theme['compatibility']) == 2) ? "".number_format($theme['compatibility'], 1, '.','')." Recommended!": vartrue(number_format($theme['compatibility'], 1, '.',''),'1.0'); + $price = ($theme['price'] > 0) ? " ".$theme['price']."" : "".Free.""; $text = ""; @@ -699,7 +765,7 @@ class themeHandler $text .= $website ? "" : ""; $text .= $theme['date'] ? "" : ""; $text .= $compat ? "" : ""; - + $text .= ""; $text .= $description ? "" : ""; @@ -894,42 +960,13 @@ class themeHandler $author = ($theme['email'] ? "".$theme['author']."" : $theme['author']); $website = ($theme['website'] ? "".$theme['website']."" : ""); - $preview = "".($theme['preview'] ? "" : "").""; + // $preview = "".($theme['preview'] ? "" : "").""; $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : E_32_TRUE; // $info_icon = ""; $info_icon = "".E_32_CAT_ABOUT.""; - $preview_icon = "".E_32_SEARCH.""; +// $preview_icon = "".E_32_SEARCH.""; $admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "\n" : E_32_TRUE; - - - if($_GET['mode'] == 'online') - { - - $d = http_build_query($theme,false,'&'); - $url = e_SELF."?src=".base64_encode($d); - $id = $frm->name2id($theme['name']); - $main_icon = " "; - $info_icon = "".trim(E_32_CAT_ABOUT).""; - - //XXX modal-Cache is currently enabled by default. Awaiting inclusion of data-cache feature. - // See here: https://github.com/twitter/bootstrap/pull/4224 - - } - - - - if(!in_array($theme['path'], $this->approvedAdminThemes)) - { - $admin_icon = ""; - } - - if($theme['name'] == 'bootstrap') - { - // print_a($theme); - } - // - // $thumbPath = (substr($theme['thumbnail'],0,4) == 'http') ? $theme['thumbnail'] : e_THEME.$theme['path'] ."/".$theme['preview'][0]; - // $thumbnail = ""; + $price = ''; if(substr($theme['thumbnail'],0,4) == 'http') { @@ -948,11 +985,54 @@ class themeHandler } $thumbnail = ""; - $preview_icon = "".E_32_SEARCH.""; + + + if($_GET['mode'] == 'online') + { + + $d = http_build_query($theme,false,'&'); + $url = e_SELF."?src=".base64_encode($d); + $id = $frm->name2id($theme['name']); + $LAN_DOWNLOAD = ($theme['price'] > 0) ? "Buy/Download" : "Download"; + + $main_icon = " "; + $info_icon = "".trim(E_32_CAT_ABOUT).""; + + if($theme['livedemo']) + { + $previewPath = $theme['livedemo']; + } + //XXX modal-Cache is currently enabled by default. Awaiting inclusion of data-cache feature. + // See here: https://github.com/twitter/bootstrap/pull/4224 + $price = ($theme['price'] > 0) ? " ".$theme['price']."" : "".Free.""; + + } + + $preview_icon = "".E_32_SEARCH.""; + + + if(!in_array($theme['path'], $this->approvedAdminThemes)) + { + $admin_icon = ""; + } + + if($theme['name'] == 'bootstrap') + { + // print_a($theme); + } + // + // $thumbPath = (substr($theme['thumbnail'],0,4) == 'http') ? $theme['thumbnail'] : e_THEME.$theme['path'] ."/".$theme['preview'][0]; + // $thumbnail = ""; + + // $thumbnail .= ""; // Choose a Theme to Install. + + + + if(!$mode) { // styles NEED to be put into style.css @@ -972,11 +1052,14 @@ class themeHandler $borderStyle = 'well'; + $text = "
".$thumbnail."
".$main_icon.$admin_icon.$info_icon.$preview_icon."
-
".$theme['name']." ".$theme['version']."
+
".$theme['name']." ".$theme['version']." + ".$price." +
"; return $text; } @@ -1018,6 +1101,7 @@ class themeHandler $text .= ""; $text .= ""; + // $text .= ""; $text .= "
".TPVLAN_5.":".$website."
".TPVLAN_6.":".$theme['date']."
".TPVLAN_57.":".$compat."
Price:".$price."
Description:".$description."
".TPVLAN_7.":".strip_tags($theme['info'],'b')."
".LAN_CATEGORY.":".$theme['category']."
Price:".$price."
".TPVLAN_49.": "; $text .= ($theme['xhtmlcompliant']) ? "W3C XHTML ".$theme['xhtmlcompliant'] : "Not Specified"; diff --git a/e107_languages/English/admin/lan_wmessage.php b/e107_languages/English/admin/lan_wmessage.php index 24c446928..db277f53f 100644 --- a/e107_languages/English/admin/lan_wmessage.php +++ b/e107_languages/English/admin/lan_wmessage.php @@ -24,7 +24,7 @@ define("WMLAN_02","Message"); define("WMLAN_04","Message Text"); define("WMLAN_05","Enclose"); -define("WMLAN_06","If ticked, the message will be rendered inside box"); +define("WMLAN_06","When enabled, the message will be rendered inside a box"); define("WMLAN_07","Override standard system to use {WMESSAGE} shortcode:"); // define("WMLAN_08","Preferences"); diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php index 7842b671b..e9a9abc9d 100644 --- a/e107_plugins/chatbox_menu/chatbox_menu.php +++ b/e107_plugins/chatbox_menu/chatbox_menu.php @@ -303,11 +303,13 @@ if(!$text = $e107cache->retrieve("nq_chatbox")) { $tp->parseTemplate("{SETIMAGE: w=40}",true); // set thumbnail size. // FIXME - move to template - $CHATBOX_TEMPLATE['start'] = "
    "; - $CHATBOX_TEMPLATE['item'] = "
  • - {CB_AVATAR} {USERNAME}  + $CHATBOX_TEMPLATE['start'] = "
      "; + $CHATBOX_TEMPLATE['item'] = "
    • + {CB_AVATAR} +
      {USERNAME}  {TIMEDATE}
      -

      {MESSAGE}

      +

      {MESSAGE}

      +
      • \n"; $CHATBOX_TEMPLATE['end'] = "
    "; diff --git a/e107_plugins/login_menu/login_menu_shortcodes.php b/e107_plugins/login_menu/login_menu_shortcodes.php index ce8d82f70..036e83367 100755 --- a/e107_plugins/login_menu/login_menu_shortcodes.php +++ b/e107_plugins/login_menu/login_menu_shortcodes.php @@ -170,7 +170,7 @@ SC_END SC_BEGIN LM_ADMIN_CONFIGURE if(ADMIN == TRUE) { - return $parm == 'href' ? e_PLUGIN.'login_menu/config.php' : ''; + return $parm == 'href' ? e_PLUGIN_ABS.'login_menu/config.php' : ''; } return ''; SC_END diff --git a/e107_themes/_blank/theme.xml b/e107_themes/_blank/theme.xml index ab35e4d4a..8864cfbe0 100644 --- a/e107_themes/_blank/theme.xml +++ b/e107_themes/_blank/theme.xml @@ -1,8 +1,9 @@ - - - - Blank e107 admin theme + + + Bootstrap e107 admin theme + Blank e107 Theme + generic @@ -10,6 +11,11 @@ + + blank + empty + template + diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index c515fcebf..189ba6705 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -203,9 +203,9 @@ img.S32:hover {} .adminlist .col-selection-cont { position: relative; float:right; } -div.e-search input[type='text'] { padding-left:25px } -div.e-search i { margin-right:-20px; margin-left:5px; margin-top:0px; z-index:100; position:relative; } -div.e-search { margin-bottom:-5px; margin-top:10px } +span.e-search input[type='text'] { padding-left:25px } +span.e-search i { margin-right:-20px; margin-left:5px; margin-top:-7px; z-index:100; position:relative; } +// span.e-search { margin-bottom:-5px; margin-top:10px } /******** SyS Messages / Message text formatting */ .s-message .s-message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; line-height: 32px; } diff --git a/e107_themes/bootstrap/style.css b/e107_themes/bootstrap/style.css index 8530ecf12..22ce7b706 100644 --- a/e107_themes/bootstrap/style.css +++ b/e107_themes/bootstrap/style.css @@ -20,13 +20,6 @@ footer { padding:60px } .nextprev-bar { clear: both; padding: 5px; font-size: 14px; margin: 5px; border:1px solid #ddd; } /* Page NextPrev navigation block */ -/******** SyS Messages / Message text formatting */ -/* message boxes */ - - -/* message text (overall) */ -/******** SyS Messages / Message text formatting */ - .s-message .s-message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; line-height: 32px; } @@ -49,33 +42,6 @@ i.s-message-debug { background-position: -1480px 0; width: 32px; height: 32px; .required { color:red } /* THEME SPECIFIC CSS *********************************************************************************************/ -/******** Page Base */ -.wrapper { width: 100%; } -.header { padding: 20px 15px 0; } -.header-content { border: 1px solid #DDDDDD} -.page-body { padding: 20px 15px 0; } -.footer {} -legend { font-size: 14px; font-weight: bold; padding: 5px; } - -/******** Block Elements */ -.block { border: 1px solid #DDDDDD; margin-bottom: 10px;} -.block-text { padding: 10px 10px 10px; } -.block h1.caption { padding: 5px 10px 5px; vertical-align: middle; } -.block h2.caption, .block h4.caption { padding: 5px 10px 5px; border-bottom: 1px solid #DDDDDD; } - -/******** Horizontal navigation ADMIN_NAV_ALT */ -.navigation { border: 1px solid #DDDDDD;} - -/******** Layout */ -.main-table { width: 100%; border: 0 none; } -.col-left { width: 220px; } -.col-right { width: 220px;} -.col-main { padding: 0 15px 0 15px;} -.inner-wrapper { margin: 0 5px } - -/******** Horizontal navigation ADMIN_NAV_ALT */ -.navigation { border: 1px solid #DDDDDD;} - /******** News item styling */ @@ -88,6 +54,7 @@ legend { font-size: 14px; font-weight: bold; padding: 5px; } div.view-item { margin-bottom:50px } /******** FEATUREBOX PLUGIN */ +/* #featurebox-ajax-container { display: block } #featurebox-ajax-container img { padding: 1px; margin: 5px; border: 1px solid #DDDDDD } @@ -101,7 +68,7 @@ div.featurebox-nav a.featurebox-nav-next:hover, div.featurebox-nav a.featurebox-nav-prev, div.featurebox-nav a.featurebox-nav-prev:hover { text-decoration: none; font-size: 16px } - +*/ .form-signin { max-width: 300px; diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php index 2295e2ca2..adc1cfb43 100644 --- a/e107_themes/bootstrap/theme.php +++ b/e107_themes/bootstrap/theme.php @@ -118,10 +118,11 @@ function tablestyle($caption, $text, $mode='') } } - +$SC_WRAPPER['NAVIGATION|s'] = '
    {---}
    '; // TODO Convert to : default-home and default-other layouts. + $HEADER['default'] = '
    @@ -144,10 +145,7 @@ $HEADER['default'] = '
    -
    - {NAVIGATION=side} - -
    + {NAVIGATION|s=side} {SETSTYLE=menu} {MENU=1}
    diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index ac3393f5c..679ba97a1 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -348,19 +348,21 @@ $(document).ready(function() $(this).closest("li").removeClass("active"); $(this).switchClass( "link-active", "link", 0 ); }); - var id = $(this).attr("href"), hash = id.substr(1), form = $('.admin-menu')[0]; // FIXME - a better way to detect the page form + var id = $(this).attr("href"), hash = id.split('#')[1], form = $('.admin-menu')[0]; // FIXME - a better way to detect the page form + $(this).switchClass( "link", "link-active", 30 ); $(this).closest("li").addClass("active"); $(id).removeClass('e-hideme').show({ effect: "slide" }); // 'remember' the active navigation pane - window.location.hash = 'nav-' + hash; - if(form) { - $(form).attr('action', $(form).attr('action').split('#')[0] + '#nav-' + hash); - } - - return false; //FIXME See admin/prefs navigation. + if(hash) { + window.location.hash = 'nav-' + hash; + if(form) { + $(form).attr('action', $(form).attr('action').split('#')[0] + '#nav-' + hash); + } + return false; + } }); // plugin navigation hash