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

Issue #1138 - Bootstrap3 theme mostly complete.

Browse Source
This commit is contained in:
Cameron
2015-07-16 01:17:21 -07:00
parent 83288964f1
commit d12eef2f07
15 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/cpage.php
View File

@@ -165,7 +165,7 @@ class page_chapters_ui extends e_admin_ui
'chapter_order' => array('title'=> LAN_ORDER, 'type' => 'text', 'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ), 'chapter_order' => array('title'=> LAN_ORDER, 'type' => 'text', 'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ),
'chapter_visibility' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE), 'chapter_visibility' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE),
'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'left last', 'class' => 'left', 'readParms'=>'sort=1') 'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'left', 'readParms'=>'sort=1')
); );
@@ -291,19 +291,21 @@ class page_chapters_form_ui extends e_admin_form_ui
$parent = $this->getController()->getListModel()->get('chapter_parent'); $parent = $this->getController()->getListModel()->get('chapter_parent');
// $id = $this->getController()->getListModel()->get('chapter_id'); // $id = $this->getController()->getListModel()->get('chapter_id');
$att['readParms'] = 'sort=1'; $att['readParms'] = 'sort=1';
$text = "";
if($attributes['mode'] == 'read') if($attributes['mode'] == 'read')
{ {
$text = "<div class='btn-group'>";
$text .= $this->renderValue('options',$value,$att,$id); $text .= $this->renderValue('options',$value,$att,$id);
if($parent != 0) if($parent != 0)
{ {
$link = e_SELF."?searchquery=&filter_options=page_chapter__".$id."&mode=page&action=list"; $link = e_SELF."?searchquery=&filter_options=page_chapter__".$id."&mode=page&action=list";
$text .= "<a href='".$link."' class='btn' title='".CUSLAN_58."'>".E_32_CUST."</a>"; $text .= "<a href='".$link."' class='btn btn-default' title='".CUSLAN_58."'>".E_32_CUST."</a>";
} }
$text .= "</div>";
return $text; return $text;
} }
} }

4
e107_admin/cron.php
View File

@@ -567,8 +567,10 @@ class cron_admin_form_ui extends e_admin_form_ui
if($attributes['mode'] == 'read') if($attributes['mode'] == 'read')
{ {
$text = $this->renderValue('options',$value,'',$id); $text = "<div class='btn-group'>";
$text .= $this->renderValue('options',$value,'',$id);
$text .= $this->submit_image('cron_execute['.$id.']', 1, 'execute', 'Execute'); $text .= $this->submit_image('cron_execute['.$id.']', 1, 'execute', 'Execute');
$text .= "</div>";
return $text; return $text;
} }
} }

3
e107_admin/db.php
View File

@@ -763,6 +763,7 @@ class system_tools
$frm = e107::getForm(); $frm = e107::getForm();
$config = e107::getMySQLConfig(); $config = e107::getMySQLConfig();
$sql = e107::getDb(); $sql = e107::getDb();
$tp = e107::getParser();
$sql->gen('SHOW TABLE STATUS WHERE Name LIKE "'.$config['mySQLprefix'].'%" '); $sql->gen('SHOW TABLE STATUS WHERE Name LIKE "'.$config['mySQLprefix'].'%" ');
@@ -829,7 +830,7 @@ class system_tools
$message .= '<li>'.DBLAN_88.'</li>'; $message .= '<li>'.DBLAN_88.'</li>';
$message .= '</ul>'; $message .= '</ul>';
$mes->add($message, E_MESSAGE_WARNING); $mes->add($tp->toHtml($message,true), E_MESSAGE_WARNING);
$text .= " $text .= "
<form method='post' action='".e_SELF."' id='linkform'> <form method='post' action='".e_SELF."' id='linkform'>

2
e107_admin/theme.php
View File

@@ -25,7 +25,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
$e_sub_cat = 'theme_manage'; $e_sub_cat = 'theme_manage';
e107::css("inline"," e107::css("inline","
h2 { text-align: right; margin-bottom: -30px; padding-right: 10px; } .block-text h2.caption { text-align: right; margin-bottom: -30px; padding-right: 10px; }
.hide { display: none } .hide { display: none }
.admin-theme-thumb { height:130px;overflow:hidden;border:1px solid black; margin:0px; margin-bottom:10px; padding:0px; } .admin-theme-thumb { height:130px;overflow:hidden;border:1px solid black; margin:0px; margin-bottom:10px; padding:0px; }
.admin-theme-thumb:hover { opacity:0.4 } .admin-theme-thumb:hover { opacity:0.4 }

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

@@ -46,7 +46,7 @@ class admin_shortcodes
'.E_16_E107.' <b class="caret"></b> '.E_16_E107.' <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li class="nav-header navbar-header">Update Available</li> <li class="nav-header dropdown-header navbar-header">Update Available</li>
<li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li> <li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li>
</ul> </ul>
</li> </li>
@@ -706,7 +706,7 @@ class admin_shortcodes
if ($count >0) if ($count >0)
{ {
$countDisp = ' <span class="label label-info">'.$count.'</span> ' ; $countDisp = ' <span class="label label-primary">'.$count.'</span> ' ;
} }
else else
{ {
@@ -723,7 +723,7 @@ class admin_shortcodes
'.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b> '.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b>
</a> </a>
<ul class="dropdown-menu" role="menu" > <ul class="dropdown-menu" role="menu" >
<li class="nav-header navbar-header">Private Messages</li> <li class="nav-header navbar-header dropdown-header">Private Messages</li>
<li><a class="e-modal" data-cache="false" data-modal-caption="Inbox" data-target="#uiModal" href="'.$inboxUrl.'" >Inbox</a></li> <li><a class="e-modal" data-cache="false" data-modal-caption="Inbox" data-target="#uiModal" href="'.$inboxUrl.'" >Inbox</a></li>
<li><a class="e-modal" data-cache="false" data-modal-caption="Outbox" data-target="#uiModal" href="'.$outboxUrl.'">Outbox</a></li> <li><a class="e-modal" data-cache="false" data-modal-caption="Outbox" data-target="#uiModal" href="'.$outboxUrl.'">Outbox</a></li>
<li><a class="e-modal" data-cache="false" data-modal-caption="Compose" data-target="#uiModal" href="'.$composeUrl.'">Compose</a></li> <li><a class="e-modal" data-cache="false" data-modal-caption="Compose" data-target="#uiModal" href="'.$composeUrl.'">Compose</a></li>
@@ -738,7 +738,7 @@ class admin_shortcodes
/*
$text = ' $text = '
<li class="dropdown"> <li class="dropdown">
@@ -760,6 +760,7 @@ class admin_shortcodes
'; ';
return $text; return $text;
*/
} }

16
e107_handlers/theme_handler.php
View File

@@ -1040,11 +1040,11 @@ class themeHandler
$author = ($theme['email'] ? "<a href='mailto:".$theme['email']."' title='".$theme['email']."'>".$theme['author']."</a>" : $theme['author']); $author = ($theme['email'] ? "<a href='mailto:".$theme['email']."' title='".$theme['email']."'>".$theme['author']."</a>" : $theme['author']);
$website = ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : ""); $website = ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : "");
// $preview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>"; // $preview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>";
$main_icon = ($pref['sitetheme'] != $theme['path']) ? "<button class='btn btn-small btn-sm btn-inverse' type='submit' name='selectmain[".$theme['id']."]' alt=\"".TPVLAN_10."\" title=\"".TPVLAN_10."\" >".$tp->toGlyph('fa-home',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>"; $main_icon = ($pref['sitetheme'] != $theme['path']) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit' name='selectmain[".$theme['id']."]' alt=\"".TPVLAN_10."\" title=\"".TPVLAN_10."\" >".$tp->toGlyph('fa-home',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
// $info_icon = "<a data-toggle='modal' data-target='".e_SELF."' href='#themeInfo_".$theme['id']."' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>"; // $info_icon = "<a data-toggle='modal' data-target='".e_SELF."' href='#themeInfo_".$theme['id']."' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
$info_icon = "<a class='btn btn-small btn-sm btn-inverse' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".e_SELF."?id=".$theme['path']."' data-target='#uiModal' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>"; $info_icon = "<a class='btn btn-default btn-small btn-sm btn-inverse' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".e_SELF."?id=".$theme['path']."' data-target='#uiModal' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
// $preview_icon = "<a title='Preview : ".$theme['name']."' rel='external' class='e-dialog' href='".e_BASE."index.php?themepreview.".$theme['id']."'>".E_32_SEARCH."</a>"; // $preview_icon = "<a title='Preview : ".$theme['name']."' rel='external' class='e-dialog' href='".e_BASE."index.php?themepreview.".$theme['id']."'>".E_32_SEARCH."</a>";
$admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-small btn-sm btn-inverse' type='submit' name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>\n" : "<button class='btn btn-small btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>"; $admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit' name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>\n" : "<button class='btn btn-small btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
$price = ''; $price = '';
if(substr($theme['thumbnail'],0,4) == 'http') if(substr($theme['thumbnail'],0,4) == 'http')
@@ -1096,7 +1096,7 @@ class themeHandler
// $main_icon = "<a data-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> "; // $main_icon = "<a data-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
$main_icon = "<a class='e-modal btn btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> "; $main_icon = "<a class='e-modal btn-default btn btn-sm btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
@@ -1104,7 +1104,7 @@ class themeHandler
// $main_icon = "<a class='e-modal btn btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='{$viewUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> "; // $main_icon = "<a class='e-modal btn btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='{$viewUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
$info_icon = "<a class='btn btn-small btn-inverse' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' data-target='#uiModal' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>"; $info_icon = "<a class='btn btn-default btn-sm btn-small btn-inverse' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' data-target='#uiModal' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
if($theme['livedemo']) if($theme['livedemo'])
{ {
@@ -1112,11 +1112,11 @@ class themeHandler
} }
//XXX modal-Cache is currently enabled by default. Awaiting inclusion of data-cache feature. //XXX modal-Cache is currently enabled by default. Awaiting inclusion of data-cache feature.
// See here: https://github.com/twitter/bootstrap/pull/4224 // See here: https://github.com/twitter/bootstrap/pull/4224
$price = ($theme['price'] > 0) ? "<span class='label label-info pull-right'><i class='icon-shopping-cart icon-white'></i> ".$theme['price']."</span>" : "<span class='label label-success pull-right'>".Free."</span>"; $price = ($theme['price'] > 0) ? "<span class='label label-primary pull-right'><i class='icon-shopping-cart icon-white'></i> ".$theme['price']."</span>" : "<span class='label label-success pull-right'>".Free."</span>";
} }
$preview_icon = "<a class='e-modal btn btn-small btn-inverse' title='Preview/Live-Demo : ".$theme['name']."' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='".$previewPath."'>".$tp->toGlyph('fa-search',array('size'=>'2x'))."</a>"; $preview_icon = "<a class='e-modal btn btn-default btn-sm btn-small btn-inverse' title='Preview/Live-Demo : ".$theme['name']."' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='".$previewPath."'>".$tp->toGlyph('fa-search',array('size'=>'2x'))."</a>";
if(!in_array($theme['path'], $this->approvedAdminThemes)) if(!in_array($theme['path'], $this->approvedAdminThemes))
@@ -1305,7 +1305,7 @@ class themeHandler
{ {
foreach ($pref['sitetheme_custompages'][$key] as $cp) foreach ($pref['sitetheme_custompages'][$key] as $cp)
{ {
$custompage_diz .= "<a href='#element-to-be-shown-{$key}' title='Set pages which should automatically use this layout. One per line.' class='e-tip btn btn-mini e-expandit'>".trim($cp)."</a>&nbsp;"; $custompage_diz .= "<a href='#element-to-be-shown-{$key}' title='Set pages which should automatically use this layout. One per line.' class='e-tip btn btn-xs btn-mini e-expandit'>".trim($cp)."</a>&nbsp;";
if($count > 4) if($count > 4)
{ {
$custompage_diz .= "..."; $custompage_diz .= "...";

8
e107_plugins/forum/forum_admin.php
View File

@@ -154,7 +154,7 @@ if(!deftrue('OLD_FORUMADMIN'))
'forum_order' => array ( 'title' => LAN_ORDER, 'type' => 'text', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'forum_order' => array ( 'title' => LAN_ORDER, 'type' => 'text', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'forum_postclass' => array ( 'title' => 'Post Permission', 'type' => 'userclass', 'inline'=>true,'filter'=>true, 'batch'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'forum_postclass' => array ( 'title' => 'Post Permission', 'type' => 'userclass', 'inline'=>true,'filter'=>true, 'batch'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'forum_threadclass' => array ( 'title' => 'Thread Creation Class', 'type' => 'userclass', 'inline'=>true, 'filter'=>true, 'batch'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'forum_threadclass' => array ( 'title' => 'Thread Creation Class', 'type' => 'userclass', 'inline'=>true, 'filter'=>true, 'batch'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'forum_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'noedit'=>true, 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'forum_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'noedit'=>true, 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'right', 'thclass' => 'center', ),
// 'Sort' => array ( 'title' => 'Sort', 'type' => 'text', 'data' => 'str', 'noedit'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), // 'Sort' => array ( 'title' => 'Sort', 'type' => 'text', 'data' => 'str', 'noedit'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'forum_options' => array ( 'title' => 'Options', 'type' => 'hidden', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'forum_options' => array ( 'title' => 'Options', 'type' => 'hidden', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
@@ -1111,11 +1111,11 @@ if(!deftrue('OLD_FORUMADMIN'))
$topic = $this->getController()->getListModel()->get('gen_chardata'); $topic = $this->getController()->getListModel()->get('gen_chardata');
$topidId = $this->getController()->getListModel()->get('gen_intdata'); $topidId = $this->getController()->getListModel()->get('gen_intdata');
$text = "<div class='btn-group'>";
$text = "<a class='e-modal btn' data-modal-caption='Topic: ".$topic."' href='".e_SELF."?mode=post&action=list&id=". $topidId."' rel='external'>".ADMIN_VIEW_ICON."</a>"; $text .= "<a class='e-modal btn btn-default' data-modal-caption='Topic: ".$topic."' href='".e_SELF."?mode=post&action=list&id=". $topidId."' rel='external'>".ADMIN_VIEW_ICON."</a>";
$text .= $this->renderValue('options',$value,array('readParms'=>'edit=0')); $text .= $this->renderValue('options',$value,array('readParms'=>'edit=0'));
$text .= "</div>";
return $text; return $text;
} }
} }

4
e107_plugins/newsfeed/admin_config.php
View File

@@ -130,8 +130,8 @@ if($headline_total = $sql->db_Select("newsfeed"))
<td>".($newsfeed_updateint ? $newsfeed_updateint : "3600")."</td> <td>".($newsfeed_updateint ? $newsfeed_updateint : "3600")."</td>
<td>".$active[$newsfeed_active]."</td> <td>".$active[$newsfeed_active]."</td>
<td> <td>
<a class='btn btn-large' href='".e_SELF."?edit.".$newsfeed_id."'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-default btn-large' href='".e_SELF."?edit.".$newsfeed_id."'>".ADMIN_EDIT_ICON."</a>
<a class='btn btn-large action delete' href='".e_SELF."?delete.".$newsfeed_id."' rel='no-confirm' title='".LAN_CONFDELETE."'>".ADMIN_DELETE_ICON."</a> <a class='btn btn-default btn-large action delete' href='".e_SELF."?delete.".$newsfeed_id."' rel='no-confirm' title='".LAN_CONFDELETE."'>".ADMIN_DELETE_ICON."</a>
</td> </td>
</tr>"; </tr>";
} }

4
e107_plugins/newsletter/admin_config.php
View File

@@ -150,8 +150,8 @@ class newsletter
<td>".$data['newsletter_title']."</td> <td>".$data['newsletter_title']."</td>
<td>".((substr_count($data['newsletter_subscribers'], chr(1))!= 0)?"<a href='".e_SELF."?vs.".$data['newsletter_id']."'>".substr_count($data['newsletter_subscribers'], chr(1))."</a>":substr_count($data['newsletter_subscribers'], chr(1)))."</td> <td>".((substr_count($data['newsletter_subscribers'], chr(1))!= 0)?"<a href='".e_SELF."?vs.".$data['newsletter_id']."'>".substr_count($data['newsletter_subscribers'], chr(1))."</a>":substr_count($data['newsletter_subscribers'], chr(1)))."</td>
<td> <td>
<a class='btn btn-large' href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-default btn-large' href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='delete[newsletter_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [ID: ".$data['newsletter_id']." ]")."') \"/> <input class='btn btn-default btn-large' type='image' title='".LAN_DELETE."' name='delete[newsletter_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [ID: ".$data['newsletter_id']." ]")."') \"/>
</td> </td>
</tr> </tr>

2
e107_plugins/poll/poll_class.php
View File

@@ -780,7 +780,7 @@ class poll
$formgo = e_SELF.(e_QUERY && !defined("RESET") && strpos(e_QUERY, 'delete') === FALSE ? "?".e_QUERY : ""); $formgo = e_SELF.(e_QUERY && !defined("RESET") && strpos(e_QUERY, 'delete') === FALSE ? "?".e_QUERY : "");
$text = "<div style='text-align:center'> $text = "<div>
<form method='post' action='{$formgo}'> <form method='post' action='{$formgo}'>
<table class='table adminform'> <table class='table adminform'>
<colgroup> <colgroup>

2
e107_themes/bootstrap3/admin_style.css
View File

@@ -112,7 +112,7 @@ td.options .btn-group { display: flex; }
#admin-ui-modal { width: 90%; } #admin-ui-modal { width: 90%; }
.selectize-input { width: 206px }
div.bbcode-panel { div.bbcode-panel {

2
e107_themes/bootstrap3/admin_template.php
View File

@@ -105,7 +105,7 @@ $E_ADMIN_NAVIGATION['button_pm'] = '
</a> </a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px"> <div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
<ul class="nav-list"> <ul class="nav-list">
<li class="nav-header">Unread Messages</li> <li class="dropdown-header nav-header">Unread Messages</li>
<li><a href="#">Incoming Message Number 1</a></li> <li><a href="#">Incoming Message Number 1</a></li>
<li><a href="#">Incoming Message Number 2</a></li> <li><a href="#">Incoming Message Number 2</a></li>
<li><a href="#">Incoming Message Number 3</a></li> <li><a href="#">Incoming Message Number 3</a></li>

13
e107_themes/bootstrap3/admin_theme.php
View File

@@ -59,10 +59,13 @@ $no_core_css = TRUE;
class bootstrap3_admintheme class bootstrap3_admintheme
{ {
function tablestyle($caption, $text, $mode) function tablestyle($caption, $text, $mode, $data)
{ {
global $style; // global $style;
$style = $data['setStyle'];
// echo "Style: ".$style;
$class = ''; $class = '';
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode); if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);
@@ -134,7 +137,7 @@ class bootstrap3_admintheme
if(deftrue('e_IFRAME')) if(deftrue('e_IFRAME'))
{ {
echo ' echo '<!-- Start Style: '.$style.' Mode: '.$mode.' and iFrame active -->
<div class="block"> <div class="block">
<div class="block-text"> <div class="block-text">
'.$text.' '.$text.'
@@ -204,7 +207,7 @@ class bootstrap3_admintheme
*/ */
case 'no_caption' : case 'no_caption' :
echo ' echo '<!-- Start Style: '.$style.' Mode: '.$mode.' -->
<div class="block"> <div class="block">
<div class="block-text"> <div class="block-text">
'.$text.' '.$text.'
@@ -215,7 +218,7 @@ class bootstrap3_admintheme
default: default:
echo ' echo '<!-- Start Style: '.$style.' Mode: '.$mode.' -->
<div class="block"> <div class="block">
<h4 class="caption">'.$caption.'</h4> <h4 class="caption">'.$caption.'</h4>
<div class="block-text"> <div class="block-text">

21
e107_themes/bootstrap3/css/bootstrap_dark.css vendored
View File

@@ -1554,9 +1554,9 @@ pre {
line-height: 1.42857143; line-height: 1.42857143;
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
color: #212121; color: #999999;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #cccccc; border: 1px solid inherit;
border-radius: 4px; border-radius: 4px;
} }
pre code { pre code {
@@ -4067,7 +4067,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus { .nav-tabs > li.active > a:focus {
color: #ffffff; color: #ffffff;
background-color: #2f2f2f; background-color: #373737;
border: 1px solid #999999; border: 1px solid #999999;
border-bottom-color: transparent; border-bottom-color: transparent;
cursor: default; cursor: default;
@@ -6814,6 +6814,21 @@ button.close {
.btn:hover { .btn:hover {
border-color: rgba(0, 0, 0, 0.6); border-color: rgba(0, 0, 0, 0.6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
background-image: -webkit-linear-gradient(#303030, #212121 60%, #171717);
background-image: -o-linear-gradient(#303030, #212121 60%, #171717);
background-image: linear-gradient(#303030, #212121 60%, #171717);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff303030', endColorstr='#ff171717', GradientType=0);
filter: none;
}
.btn:hover,
.btn:hover:hover {
background-image: -webkit-linear-gradient(#000000, #000000 40%, #000000);
background-image: -o-linear-gradient(#000000, #000000 40%, #000000);
background-image: linear-gradient(#000000, #000000 40%, #000000);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000', endColorstr='#ff000000', GradientType=0);
filter: none;
} }
.btn-default { .btn-default {
background-image: -webkit-linear-gradient(#303030, #212121 60%, #171717); background-image: -webkit-linear-gradient(#303030, #212121 60%, #171717);