Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3845 : General UI cleanup

This commit is contained in:
Naomi Aro 2012-05-21 17:07:34 +02:00
parent f485b9b601
commit 4fe80194b6
5 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/views/scripts/form/showbuilder.phtml
View File

@ -1,4 +1,7 @@
<div class="sb-timerange">
<div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files.">
<span class="ui-icon ui-icon-arrowthick-1-nw"></span>
</div>
<?php echo $this->element->getElement('sb_date_start') ?>
<?php echo $this->element->getElement('sb_time_start') ?>
<?php echo $this->element->getElement('sb_date_end') ?>

8
airtime_mvc/application/views/scripts/showbuilder/builder.phtml
View File

@ -1,8 +0,0 @@
<?php if ($this->toggleLib): ?>
<div id="sb_edit" class="ui-state-default" title="open the library to schedule files.">
<span class="ui-icon ui-icon-arrowthick-1-nw"></span>
</div>
<?php endif; ?>
<?php echo $this->sb_form; ?>
<table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>

6
airtime_mvc/application/views/scripts/showbuilder/index.phtml
View File

@ -9,12 +9,6 @@
<?php endif; ?>
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
<?php if (!$this->disableLib && !$this->showLib): ?>
<div id="sb_edit" class="ui-state-default" title="open the library to schedule files.">
<span class="ui-icon ui-icon-arrowthick-1-nw"></span>
</div>
<?php endif; ?>
<?php echo $this->sb_form; ?>
<table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>

20
airtime_mvc/public/css/showbuilder.css
View File

@ -19,15 +19,6 @@
background-color: rgba(255, 136, 56, 1);
}
#sb_edit {
position: relative;
top: 2px;
float: left;
margin-right: 5px;
padding: 1px 2px;
cursor: pointer;
}
.sb-content .fg-toolbar ul {
float: left;
padding: 0;
@ -99,13 +90,22 @@ div.sb-timerange {
position: relative;
}
div.sb-timerange div {
div.sb-timerange div#sb_edit {
position:absolute;
padding: 3px;
}
div.sb-timerange div#sb_submit {
position: absolute;
bottom: 0px;
padding: 3px;
margin-left: 5px;
}
div.sb-timerange input#sb_date_start {
margin-left: 30px;
}
.sb-starts,
.sb-ends {
text-align: center;

16
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View File

@ -15,7 +15,7 @@ AIRTIME = (function(AIRTIME) {
timeStartId = "#sb_time_start",
dateEndId = "#sb_date_end",
timeEndId = "#sb_time_end",
$toggleLib = $('<div id="sb_edit" class="ui-state-default" title="open the library to schedule files."><span class="ui-icon ui-icon-arrowthick-1-nw"></span></div>'),
$toggleLib = $('<div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files."><span class="ui-icon ui-icon-arrowthick-1-nw"></span></div>'),
$libClose = $('<a />', {
"class": "close-round",
"href": "#",
@ -74,6 +74,9 @@ AIRTIME = (function(AIRTIME) {
$builder.width(Math.floor(screenWidth * 0.5))
.find("#sb_edit")
.remove()
.end()
.find("#sb_date_start")
.css("margin-left", 0)
.end();
oTable = $('#show_builder_table').dataTable();
@ -143,7 +146,7 @@ AIRTIME = (function(AIRTIME) {
oTable.fnDraw();
});
$builder.on("click","#sb_edit", function () {
$builder.on("click","#sb_edit", function (ev){
var schedTable = $("#show_builder_table").dataTable();
//reset timestamp to redraw the cursors.
@ -155,6 +158,9 @@ AIRTIME = (function(AIRTIME) {
$builder.width(Math.floor(screenWidth * 0.5))
.find("#sb_edit")
.remove()
.end()
.find("#sb_date_start")
.css("margin-left", 0)
.end();
schedTable.fnDraw();
@ -174,9 +180,13 @@ AIRTIME = (function(AIRTIME) {
$lib.hide();
$builder.width(screenWidth)
.find(".sb-timerange")
.append($toggleLib)
.prepend($toggleLib)
.find("#sb_date_start")
.css("margin-left", 30)
.end()
.end();
$toggleLib.removeClass("ui-state-hover");
schedTable.fnDraw();
$.ajax({