diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index 596a065ff..3bb254c81 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -501,6 +501,7 @@ class news_shortcodes extends e_shortcode $tp = e107::getParser(); if (ADMIN && getperms('H')) { + //TODO - discuss - a pref for 'new browser window' loading, or a parm or leave 'new browser window' as default? $default = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('icon-edit',false) : "\"".LAN_EDIT."\""; @@ -509,7 +510,7 @@ class news_shortcodes extends e_shortcode $class = varset($parm['class']); - return "".$adop_icon."\n"; + return "".$adop_icon."\n"; } else { diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index b822aafd8..1653be8f3 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -2889,7 +2889,22 @@ e107::getDebug()->log($sc_parameters); } + /** + * Render a direct link admin-edit button on the frontend. + * @param $url + * @param string $perms + * @return string + */ + public function instantEditButton($url, $perms='0') + { + if(deftrue("BOOTSTRAP") && getperms($perms)) + { + return "".e107::getParser()->toGlyph('fa-edit').""; + } + return ''; + + } diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php index 6d7577ec5..9faab184e 100644 --- a/e107_handlers/menu_class.php +++ b/e107_handlers/menu_class.php @@ -507,24 +507,17 @@ class e_menu // print_a($template['body']); $text = $head.$tp->parseTemplate($template['body'], true, $page_shortcodes).$foot; // echo "TEMPLATE= ($mpath)".$page['menu_template']; - - - - // if($template['noTableRender'] !==true) // XXX Deprecated - causes confusion while themeing. use {SETSTYLE=none} instead. - // { - $ns->setUniqueId('cmenu-'.$page['menu_name']); - $ns->tablerender($caption, $text, 'cmenu-'.$page['menu_template']); - // } - // else - // { - // echo $text; - // } - + + $ns->setUniqueId('cmenu-'.$page['menu_name']); + $caption .= e107::getForm()->instantEditButton(e_ADMIN_ABS."cpage.php?mode=menu&action=edit&tab=2&id=".intval($page['page_id']),'J'); + + $ns->tablerender($caption, $text, 'cmenu-'.$page['menu_template']); } else { $text = $tp->toHTML($page['menu_text'], true, 'parse_sc, constants'); $ns->setUniqueId('cmenu-'.$page['menu_name']); + $ns->tablerender($caption, $text, 'cmenu'); } diff --git a/e107_plugins/news/other_news2_menu.php b/e107_plugins/news/other_news2_menu.php index 0f84d349e..62b44cfc9 100644 --- a/e107_plugins/news/other_news2_menu.php +++ b/e107_plugins/news/other_news2_menu.php @@ -103,6 +103,16 @@ if(!$OTHERNEWS2_STYLE) } } + +$template['caption'] .= e107::getForm()->instantEditButton(e_ADMIN_ABS."newspost.php?searchquery=&filter_options=news_render_type__3", 'H'); + + + + + + + + if(!defined("OTHERNEWS2_LIMIT")){ // define("OTHERNEWS2_LIMIT",5); } diff --git a/e107_plugins/social/fb_like_menu.php b/e107_plugins/social/fb_like_menu.php index 3f0fd6f04..6a6ff3d56 100644 --- a/e107_plugins/social/fb_like_menu.php +++ b/e107_plugins/social/fb_like_menu.php @@ -11,12 +11,15 @@ //@see https://developers.facebook.com/docs/plugins/like-button e107::lan('social',false, true); $pref = e107::pref('social'); + +$caption = "Facebook"; +$caption .= e107::getForm()->instantEditButton(e_PLUGIN_ABS."social/admin_config.php#tab-1",'P'); + + if(deftrue('SOCIAL_FACEBOOK_INIT') ) { e107::js('footer-inline', SOCIAL_FACEBOOK_INIT); // defined in e_header.php - - $action = vartrue($pref['facebook_like_menu_action'], 'like'); // or 'recommend'; $layout = vartrue($pref['facebook_like_menu_layout'], 'standard'); // standard, button_count, button or box_count. $width = vartrue($pref['facebook_like_menu_width'], 150); @@ -28,17 +31,19 @@ if(deftrue('SOCIAL_FACEBOOK_INIT') ) $text .= '
'; $text .= ""; - e107::getRender()->tablerender('Facebook',$text,'facebook-like-menu'); + + + e107::getRender()->tablerender($caption,$text,'facebook-like-menu'); } elseif(deftrue('XURL_FACEBOOK')) { $width = vartrue($pref['facebook_like_menu_width'], 350); $text .= ''; - e107::getRender()->tablerender('Facebook',$text,'facebook-like-menu'); + e107::getRender()->tablerender($caption,$text,'facebook-like-menu'); } elseif(ADMIN) { $text = "
".LAN_SOCIAL_100."
"; - e107::getRender()->tablerender('Facebook',$text,'facebook-like-menu'); + e107::getRender()->tablerender($caption,$text,'facebook-like-menu'); } \ No newline at end of file diff --git a/e107_themes/voux/install/install.xml b/e107_themes/voux/install/install.xml index 901603494..852d8992e 100644 --- a/e107_themes/voux/install/install.xml +++ b/e107_themes/voux/install/install.xml @@ -178,6 +178,15 @@ 'vimeo' => '', )]]> + + '1', + 'facebook-like' => '1', + 'twitter' => '1', + 'google-plus1' => '1', + 'pinterest' => '1', +)]]> + diff --git a/e107_themes/voux/templates/news/news_template.php b/e107_themes/voux/templates/news/news_template.php index 2202dd937..2c300a13e 100644 --- a/e107_themes/voux/templates/news/news_template.php +++ b/e107_themes/voux/templates/news/news_template.php @@ -85,12 +85,14 @@ $NEWS_TEMPLATE['default']['item'] = '
{NEWSCATEGORY} -

{NEWSTITLELINK}

+

{NEWSTITLELINK}

{NEWSIMAGE: item=1}
{NEWSMETADIZ} + {ADMINOPTIONS}

Continue Reading

+
diff --git a/e107_web/css/e107.css b/e107_web/css/e107.css index 4158e4d45..2806fa6b8 100644 --- a/e107_web/css/e107.css +++ b/e107_web/css/e107.css @@ -184,7 +184,7 @@ div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */ padding: 10px 0; } - +.e-instant-edit { position: absolute; right: 10px; text-align: right; display: inline-block; z-index:1000; margin-right:10px; }