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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-19 17:38:00 -04:00
commit cde8c60afc
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View file

@ -4,7 +4,7 @@ if (isset($this->obj)) {
$count = count($contents); $count = count($contents);
} }
?> ?>
<div class="btn-toolbar clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false"> <button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
New <span class="caret"></span> New <span class="caret"></span>

2
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View file

@ -4,7 +4,7 @@ if (isset($this->obj)) {
$count = count($contents); $count = count($contents);
} }
?> ?>
<div class="btn-toolbar clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false"> <button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false">
New <span class="caret"></span> New <span class="caret"></span>

2
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View file

@ -1,4 +1,4 @@
<div class="btn-toolbar clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false"> <button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
New <span class="caret"></span> New <span class="caret"></span>

4
airtime_mvc/public/css/playlist_builder.css
View file

@ -56,6 +56,10 @@
} }
.spl-no-top-margin {
margin-top: 0px !important;
}
.ui-icon-closethick { .ui-icon-closethick {
margin-top: 7px; margin-top: 7px;
} }

8
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View file

@ -69,9 +69,9 @@ AIRTIME = (function(AIRTIME) {
if ($lib.filter(':visible').length > 0) { if ($lib.filter(':visible').length > 0) {
$lib.width(Math.floor(screenWidth * 0.49)); $lib.width(Math.floor(screenWidth * 0.48));
$builder.width(Math.floor(screenWidth * 0.49)) $builder.width(Math.floor(screenWidth * 0.48))
.find("#sb_edit") .find("#sb_edit")
.remove() .remove()
.end() .end()
@ -155,9 +155,9 @@ AIRTIME = (function(AIRTIME) {
AIRTIME.showbuilder.resetTimestamp(); AIRTIME.showbuilder.resetTimestamp();
$lib.show() $lib.show()
.width(Math.floor(screenWidth * 0.49)); .width(Math.floor(screenWidth * 0.48));
$builder.width(Math.floor(screenWidth * 0.49)) $builder.width(Math.floor(screenWidth * 0.48))
.find("#sb_edit") .find("#sb_edit")
.remove() .remove()
.end() .end()

2
install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
View file

@ -22,7 +22,7 @@ WHERE id IN
(SELECT s.id (SELECT s.id
FROM cc_schedule s FROM cc_schedule s
LEFT JOIN cc_show_instances si ON s.instance_id = si.id LEFT JOIN cc_show_instances si ON s.instance_id = si.id
AND si.modified_instance = 't') AND si.modified_instance = 't');
ALTER TABLE cc_files ALTER TABLE cc_files
DROP CONSTRAINT cc_files_gunid_idx; DROP CONSTRAINT cc_files_gunid_idx;