mirror of
https://github.com/e107inc/e107.git
synced 2025-04-21 13:11:52 +02:00
More styling
This commit is contained in:
Cameron
parent
a7a6924162
commit
63b1fac26b
@ -889,10 +889,25 @@ class e_form
|
||||
*/
|
||||
function checkbox($name, $value, $checked = false, $options = array())
|
||||
{
|
||||
if(!is_array($options)) parse_str($options, $options);
|
||||
$options = $this->format_options('checkbox', $name, $options);
|
||||
|
||||
$options['checked'] = $checked; //comes as separate argument just for convenience
|
||||
return "<input type='checkbox' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
|
||||
|
||||
|
||||
$text = "";
|
||||
|
||||
if(vartrue($options['label'])) // Bootstrap compatible markup
|
||||
{
|
||||
$text .= "<label class='checkbox'>";
|
||||
}
|
||||
|
||||
$text .= "<input type='checkbox' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
|
||||
|
||||
if(vartrue($options['label']))
|
||||
{
|
||||
$text .= $options['label']."</label>";
|
||||
}
|
||||
return $text;
|
||||
}
|
||||
|
||||
function checkbox_label($label_title, $name, $value, $checked = false, $options = array())
|
||||
@ -1047,8 +1062,8 @@ class e_form
|
||||
$options['class'] .= ' e-multiselect';
|
||||
}
|
||||
else
|
||||
{
|
||||
$options['class'] .= ' e-select';
|
||||
{
|
||||
$options['class'] .= ' e-select';
|
||||
}
|
||||
return "<select name='{$name}'".$this->get_attributes($options, $name).">";
|
||||
}
|
||||
@ -1572,13 +1587,23 @@ class e_form
|
||||
function columnSelector($columnsArray, $columnsDefault = '', $id = 'column_options')
|
||||
{
|
||||
$columnsArray = array_filter($columnsArray);
|
||||
|
||||
/*
|
||||
$text = "
|
||||
<div class='col-selection-cont e-tip' data-placement='left' title='Select columns to display'>
|
||||
<a href='#".$id."' class='e-show-if-js e-expandit' >"
|
||||
."<img class='icon' src='".e_IMAGE_ABS."admin_images/select_columns_16.png' alt='select columns' />"
|
||||
."</a>
|
||||
<div id='".$id."' class='e-show-if-js e-hideme col-selection'><div class='col-selection-body'>
|
||||
<div id='".$id."' class='e-show-if-js e-hideme col-selection'>
|
||||
<div class='col-selection-body dropdown'>
|
||||
<ul class='dropdown-menu' role='menu' aria-labelledby='dLabel'>
|
||||
";
|
||||
*/
|
||||
$text = '<div class="dropdown e-tip pull-right" data-placement="left">
|
||||
<a class="dropdown-toggle" title="Select columns to display" data-toggle="dropdown" href="#"><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu col-selection e-noclick" role="menu" aria-labelledby="dLabel">
|
||||
<li class="nav-header">Display Columns</li>';
|
||||
|
||||
unset($columnsArray['options'], $columnsArray['checkboxes']);
|
||||
|
||||
foreach($columnsArray as $key => $fld)
|
||||
@ -1587,26 +1612,55 @@ class e_form
|
||||
{
|
||||
$checked = (in_array($key,$columnsDefault)) ? TRUE : FALSE;
|
||||
$ttl = isset($fld['title']) ? defset($fld['title'], $fld['title']) : $key;
|
||||
// $text .= "
|
||||
// <div class='field-spacer'>
|
||||
// ".$this->checkbox_label($ttl, 'e-columns[]', $key, $checked)."
|
||||
// </div>
|
||||
// ";
|
||||
//
|
||||
$text .= "
|
||||
<div class='field-spacer'>
|
||||
".$this->checkbox_label($ttl, 'e-columns[]', $key, $checked)."
|
||||
</div>
|
||||
<li role='menuitem'><a href='#'>
|
||||
".$this->checkbox('e-columns[]', $key, $checked,'label='.$ttl)."
|
||||
</a>
|
||||
</li>
|
||||
";
|
||||
}
|
||||
}
|
||||
|
||||
// has issues with the checkboxes.
|
||||
$text .= "
|
||||
$text .= "<li>
|
||||
<div id='{$id}-button' class='right'>
|
||||
".$this->admin_button('etrigger_ecolumns', LAN_SAVE, 'other')."
|
||||
".$this->admin_button('etrigger_ecolumns', LAN_SAVE, 'btn-small')."
|
||||
</div>
|
||||
</div></div>
|
||||
</div>
|
||||
";
|
||||
</li>
|
||||
</ul>
|
||||
</div>";
|
||||
|
||||
// $text .= "</div></div>";
|
||||
|
||||
$text .= "";
|
||||
|
||||
|
||||
/*
|
||||
$text = '<div class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
|
||||
<li>hi</li>
|
||||
</ul>
|
||||
</div>';
|
||||
*/
|
||||
return $text;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function colGroup($fieldarray, $columnPref = '')
|
||||
{
|
||||
@ -2195,8 +2249,8 @@ class e_form
|
||||
$value = "<a class='e-tip e-editable' data-placement='left' data-value=',".$value."' data-name='".$field."' data-source=\"".$source."\" title=\"".LAN_EDIT." ".$attributes['title']."\" data-type='select' data-pk='".$id."' data-url='".e_SELF."?mode=&action=inline&id={$id}&ajax_used=1' href='#'>".$dispvalue."</a>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$value = $dispvalue;
|
||||
{
|
||||
$value = $dispvalue;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -2222,8 +2276,8 @@ class e_form
|
||||
$value = "<a class='e-tip e-editable' data-placement='left' data-value=',".$value."' data-name='".$field."' data-source=\"".$source."\" title=\"".LAN_EDIT." ".$attributes['title']."\" data-type='checklist' data-pk='".$id."' data-url='".e_SELF."?mode=&action=inline&id={$id}&ajax_used=1' href='#'>".$dispvalue."</a>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$value = $dispvalue;
|
||||
{
|
||||
$value = $dispvalue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* info: Default stylesheet */
|
||||
|
||||
body { padding-top: 75px; padding-bottom: 40px; }
|
||||
body { padding-top: 75px; padding-bottom: 40px; background-color: #EEEEEE}
|
||||
|
||||
.well { padding:10px; }
|
||||
.navbar { }
|
||||
@ -76,44 +76,42 @@ a.brand:hover img {
|
||||
-ms-filter: blur(13px);
|
||||
}
|
||||
*/
|
||||
@media (min-width: 1300px) {
|
||||
@media (min-width: 1300px) {
|
||||
|
||||
.sidebar-nav { font-size:12px; }
|
||||
.sidebar-nav { font-size:12px; }
|
||||
|
||||
}
|
||||
|
||||
.modal { min-width:800px; }
|
||||
.modal { min-width:800px; }
|
||||
|
||||
@media (min-width: 1500px) {
|
||||
|
||||
.sidebar-nav { font-size:15px; }
|
||||
.sidebar-nav { font-size:15px; }
|
||||
|
||||
}
|
||||
|
||||
.nav-collapse { margin-top:8px; }
|
||||
.nav-collapse { margin-top:8px; }
|
||||
|
||||
.dropdown-menu i,
|
||||
.dropdown-menu img { padding: 0px 0px; margin-right: 10px; }
|
||||
.dropdown-menu img { padding: 0px 0px; margin-right: 10px; }
|
||||
|
||||
/* breaks latest dropdown skin */
|
||||
.dropdown-menu a {
|
||||
/* filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); Firefox 10+, Firefox on Android */
|
||||
/*filter: gray; IE6-9 */
|
||||
/*-webkit-filter: grayscale(100%); Chrome 19+, Safari 6+, Safari 6+ iOS */
|
||||
}
|
||||
.nav ul li ul.dropdown-menu > li a {
|
||||
filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 10+, Firefox on Android */
|
||||
filter: gray; /* IE6-9 */
|
||||
-webkit-filter: grayscale(100%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */
|
||||
}
|
||||
|
||||
|
||||
.nav ul li ul.dropdown-menu a:hover { filter: none; -webkit-filter: grayscale(0%); }
|
||||
|
||||
.dropdown-menu a:hover { filter: none; -webkit-filter: grayscale(0%); }
|
||||
legend { display:none }
|
||||
|
||||
legend { display:none }
|
||||
|
||||
.btn { vertical-align: top; }
|
||||
.btn { vertical-align: top; }
|
||||
|
||||
|
||||
input::-webkit-input-placeholder { font-style:italic }
|
||||
input::-webkit-input-placeholder { font-style:italic }
|
||||
|
||||
input:-moz-placeholder { font-style:italic }
|
||||
input:-moz-placeholder { font-style:italic }
|
||||
|
||||
|
||||
|
||||
@ -165,18 +163,16 @@ img.S32:hover {}
|
||||
|
||||
/*******************************************************************************************************************/
|
||||
/* Admin List Table */
|
||||
.adminlist, .adminform { width:100%; border:1px solid #ddd;}
|
||||
.adminlist th { border-bottom:1px solid #ddd; }
|
||||
.adminlist td { border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
|
||||
.adminlist, .adminform { width:100%; border:1px solid #ddd;}
|
||||
.adminlist th { border-bottom:1px solid #ddd; }
|
||||
.adminlist td { border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
|
||||
.adminlist th.last,
|
||||
.adminlist td.last { border-right: 0px solid;}
|
||||
.adminlist tr.last td { border-bottom: 0px solid;}
|
||||
.adminlist thead { background-color:#f2f2f2; }
|
||||
.adminlist tr.even { background-color:#f6f6f6; }
|
||||
.adminlist .col-selection-cont { position: relative; float:right; }
|
||||
.adminlist td.last { border-right: 0px solid;}
|
||||
.adminlist tr.last td { border-bottom: 0px solid;}
|
||||
.adminlist thead { background-color:#f2f2f2; }
|
||||
.adminlist tr.even { background-color:#f6f6f6; }
|
||||
.adminlist .col-selection-cont { position: relative; float:right; }
|
||||
|
||||
.col-selection-cont .col-selection { text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px; overflow:visible; position: absolute; z-index:101; right:0px;}
|
||||
.col-selection .col-selection-body { padding: 5px; clear: both; }
|
||||
|
||||
|
||||
/******** SyS Messages / Message text formatting */
|
||||
@ -573,3 +569,32 @@ i.e-safari-32{ background-position: -427px 0; width: 32px; height: 32px; }
|
||||
i.e-seamonkey-16{ background-position: -464px 0; width: 16px; height: 16px; }
|
||||
i.e-seamonkey-32{ background-position: -485px 0; width: 32px; height: 32px; }
|
||||
|
||||
|
||||
|
||||
/* NEw */
|
||||
|
||||
tr.first { background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
|
||||
|
||||
/* Dark Drop-Down Menus */
|
||||
ul.col-selection { text-align:left; overflow:visible; z-index:101; background-color: rgb(23, 23, 23); }
|
||||
ul.col-selection > li a { border-top: 1px solid rgb(51, 51, 51); border-bottom: 1px solid rgb(32, 32, 32); }
|
||||
ul.col-selection > li a { padding: 5px 0px 5px 25px; color: rgb(153, 153, 153); }
|
||||
ul.col-selection > li a label { padding-left:0px }
|
||||
|
||||
.nav ul li ul.dropdown-menu { margin-top:-5px; border-left:1px solid rgb(51, 51, 51); background-color: rgb(39, 39, 39); }
|
||||
.nav ul li ul.dropdown-menu > li a { border-top: 1px solid rgb(51, 51, 51); border-bottom: 1px solid rgb(32, 32, 32); }
|
||||
.nav ul li ul.dropdown-menu > li a { padding-top:5px; padding-bottom:5px; color: rgb(153, 153, 153); }
|
||||
.nav ul li ul.dropdown-menu > li a:hover { color: rgb(255, 255, 255); }
|
||||
|
||||
|
||||
/* FIXME drop-down caret needs to be remove */
|
||||
|
||||
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
|
||||
color: rgb(255, 255, 255);
|
||||
background-color: rgb(39, 39, 39);
|
||||
border-top: 1px solid rgb(51, 51, 51);
|
||||
border-left:1px solid rgb(51, 51, 51);
|
||||
border-top:1px solid rgb(51, 51, 51);
|
||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user