1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00

Search box styling etc.

This commit is contained in:
Cameron
2013-02-22 00:49:36 -08:00
parent c9e5252041
commit ec3c006e6e
3 changed files with 109 additions and 18 deletions

View File

@@ -671,7 +671,7 @@ class e_admin_response
* @param boolean|string $glue * @param boolean|string $glue
* @return unknown * @return unknown
*/ */
function getTitle($namespace = 'default', $reset = false, $glue = ' - ') function getTitle($namespace = 'default', $reset = false, $glue = ' ')
{ {
$content = array(); $content = array();
if(isset($this->_title[$namespace]) && is_array($this->_title[$namespace])) if(isset($this->_title[$namespace]) && is_array($this->_title[$namespace]))
@@ -687,7 +687,9 @@ class e_admin_response
return ($glue ? $content : implode($this->_title_separator, $content)); return ($glue ? $content : implode($this->_title_separator, $content));
} }
return implode($glue, $content); $glue = ' <i class="icon-play e-breadcrumb"></i> '; // admin-ui used only by bootstrap.
return $head. implode($glue, $content).$foot;
} }
/** /**
@@ -4881,7 +4883,7 @@ class e_admin_form_ui extends e_form
parse_str($input_options, $input_options); parse_str($input_options, $input_options);
} }
$input_options['id'] = false; $input_options['id'] = false;
$input_options['class'] = 'tbox input-text filter'; $input_options['class'] = 'tbox input-text filter ';
$controller = $this->getController(); $controller = $this->getController();
$filter_pre = vartrue($controller->preFiliterMarkup); $filter_pre = vartrue($controller->preFiliterMarkup);
$filter_post = vartrue($controller->postFiliterMarkup); $filter_post = vartrue($controller->postFiliterMarkup);
@@ -4908,7 +4910,7 @@ class e_admin_form_ui extends e_form
<legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend> <legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend>
".$filter_pre." ".$filter_pre."
<div class='left' style='margin-top:10px;margin-bottom:-10px'> <div class='left' style='margin-top:10px;margin-bottom:-10px'>
".$this->text('searchquery', $current_query[0], 50, $input_options)." ".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='icon-search searchquery'></i>
".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." ".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')." ".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."

View File

@@ -1,6 +1,6 @@
/* info: Default stylesheet */ /* info: Default stylesheet */
body { padding-top: 75px; padding-bottom: 40px; background-color: #EEEEEE} body { padding-top: 75px; background-color: #EEEEEE; }
.well { padding:10px; } .well { padding:10px; }
.navbar { } .navbar { }
@@ -35,8 +35,9 @@ e-tabs fieldset { padding:0px ; padding-left:3px; border-top:0px;}
#tab-container td { border-top:0px; border-bottom:1px solid rgb(221, 221, 221) } #tab-container td { border-top:0px; border-bottom:1px solid rgb(221, 221, 221) }
.tab-border { border-left: 1px solid #ddd; } .tab-border { border-left: 1px solid #ddd; }
.core-mainpanel-block { text-align:center; width:120px; float:left; height:48px; display:block; margin: 0px 6px 60px 6px; } .core-mainpanel-block { text-align:center; width:110px; float:left; height:48px; display:block; padding:20px 5px 20px 5px; margin: 0px 6px 30px 6px; }
.core-mainpanel-link-text { text-decoration: none; padding:0px; } .core-mainpanel-link-text { text-decoration: none; display:block; }
td.center, th.center { text-align:center } td.center, th.center { text-align:center }
@@ -91,7 +92,7 @@ a.brand:hover img {
} }
.nav-collapse { margin-top:8px; } .nav-collapse { margin-top:8px; }
.dropdown-menu { box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.3); }
.dropdown-menu i, .dropdown-menu i,
.dropdown-menu img { padding: 0px 0px; margin-right: 10px; } .dropdown-menu img { padding: 0px 0px; margin-right: 10px; }
@@ -599,3 +600,91 @@ ul.col-selection > li a label { padding-left:0px; display:block; line-height
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2);
} }
ul.recent-comments {padding: 0px;
margin: 0px;
list-style: none outside none;
}
li.separator {
padding-bottom: 10px;
margin-top: 10px;
}
.recent-comments .separator {
margin-top: 10px;
padding-bottom: 10px;
}
.recent-comments .article-post {
padding-top: 8px;
margin-left: 78px;
}
.avatar {
margin: 10px;
border-radius: 5px 5px 5px 5px;
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5);
display: inline-block;
}
.recent-comments .btn-group {
margin-top: 10px;
}
.recent-comments .user-info {
color: rgb(51, 51, 51);
font-size: 10px;
}
div.left-panel {
background-color: yellow;
}
#tab-container {
background-color: transparent;
}
i.e-breadcrumb {
margin-top:3px;
}
footer { padding-top:60px; color: rgb(153, 153, 153); }
#searchquery {
padding-left:22px;
margin-right:-12px;
}
i.searchquery {
z-index:100;
position:relative;
left:-215px;
top:-4px;
}
/*
body { background-color: rgb(68, 68, 68); }
#left-panel {
}
#right-panel {
background-color: #EEEEEE;
border-top-left-radius: 12px;
padding-top:20px;
padding-left:10px;
}
footer {
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), transparent), url("images/bg-footer.jpg");
background-repeat: repeat-x, repeat;
background-size: 100px 15px, 140px 140px;
margin:0px;
padding:40px;
color: rgb(119, 119, 119);
}
*/

View File

@@ -207,17 +207,19 @@ $ADMIN_HEADER = '<div class="navbar navbar-inverse navbar-fixed-top">
$ADMIN_HEADER .= '<div class="container-fluid"> $ADMIN_HEADER .= '<div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span2"> <div class="span2" id="left-panel">
{SETSTYLE=admin_menu} {SETSTYLE=admin_menu}
{ADMIN_MENU} {ADMIN_MENU}
{ADMIN_MENUMANAGER} {ADMIN_MENUMANAGER}
{SETSTYLE=site_info}
{ADMIN_PWORD} {ADMIN_PWORD}
{SETSTYLE=site_info}
{ADMIN_HELP} {ADMIN_HELP}
{ADMIN_SITEINFO=creditsonly} {ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu} {SETSTYLE=default}
{ADMIN_STATUS=infopanel} {ADMIN_STATUS=infopanel}
{ADMIN_LATEST=infopanel} {ADMIN_LATEST=infopanel}
{ADMIN_LOG=request} {ADMIN_LOG=request}
@@ -229,20 +231,18 @@ $ADMIN_HEADER .= '<div class="container-fluid">
{SETSTYLE=none} {SETSTYLE=none}
</div> </div>
<div class="span10">'; <div class="span10" id="right-panel" >';
$ADMIN_FOOTER = ' $ADMIN_FOOTER = '
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->
<hr> </div><!--/.fluid-container-->
<footer class="center mute">
<footer class="center">
Copyright &copy; 2008-2013 e107 Inc (e107.org)<br /> Copyright &copy; 2008-2013 e107 Inc (e107.org)<br />
</footer> </footer>';
</div><!--/.fluid-container-->';