developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
This commit is contained in:
Christophe Vilayphiou committed 2012-04-30 07:57:20 +08:00
2 parents 2362e1cfdd b8f52fa1ec
commit 20504b2205
213 files changed
+5215 -779
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/bulletin_form.js.erb
+1 -9
View File
@@ -11,17 +11,9 @@ $(document).on('click', '.action a.remove_existing_record', function(){
$("tr #" + $(this).prev().attr('value')).hide();
});
$('.quick_edit_cancel').live('click', function(){
$(document).on('click', '.quick_edit_cancel', function(){
tr = $(this).attr('rel');
$('#' + tr).hide();
$("tr#bulletin_file_" + $(this).prev().attr('value')).hide();
$("tr#bulletin_link_" + $(this).prev().attr('value')).hide();
});
$(document).on('click', '.list-remove', function(){
$('#delete_bulletins').submit();
});
$(document).on('click', '#check_all_bulletins', function(){
$('.checkbox_in_list').attr("checked", this.checked);
});
app/assets/javascripts/inc/modal-preview.js
+1 -1
View File
@@ -4,7 +4,7 @@
$(document).ready(function() {
$("a.preview_trigger").click(function(){
$(this).after("<span id='show_preview'></span>");
$("#main-wrap").after("<span id='show_preview'></span>");
$.ajax({
type: 'PUT',
url:$(this).attr("href"),
app/assets/javascripts/inc/permission-checkbox.js
+4 -1
View File
@@ -1,4 +1,7 @@
$(document).ready(function() {
permissionCheckbox();
});
function permissionCheckbox(){
$('.check[checked="checked"]').parents(".checkbox").addClass("checked")
$(".checkbox").click(function(){
if($(this).children(".check").attr("checked")){
@@ -16,4 +19,4 @@ $(document).ready(function() {
placement: 'bottom',
delay: { show: 100, hide: 300 },
});
});
};
app/assets/javascripts/orbit-1.0.js
+21 -8
View File
@@ -1,5 +1,6 @@
var viewportwidth,
viewportheight;
console.log($(window).height())
function resize() {
viewportheight=$(window).height();
viewportwidth=$(window).width();
@@ -49,14 +50,20 @@ $(document).ready(function(){
resize();
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
$subWiget = $('#sub-wiget').width()+18;
$('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$orbitBar = $('#orbit-bar').height(),
$mainSidebar = $('#main-sidebar').width()+5,
$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
console.log($orbitBar);
console.log("ready"+$(window).height());
$('#main-sidebar').css("height", viewportheight-$orbitBar);
$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
$('#main-sidebar').tinyscrollbar();
$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
$('.detal-list').tinyscrollbar();
$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
mainTablePosition();
/*isotope*/
@@ -72,12 +79,18 @@ $(window).resize(function(){
resize();
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
$subWiget = $('#sub-wiget').width()+18;
$('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$orbitBar = $('#orbit-bar').height(),
$mainSidebar = $('#main-sidebar').width()+5,
$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
console.log(viewportheight);
$('#main-sidebar').css("height", viewportheight-$orbitBar);
$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
mainTablePosition();
});
/*main-table position*/
app/assets/javascripts/sort_header.js
+7
View File
@@ -0,0 +1,7 @@
$(document).on('click', '.list-remove', function(){
$('#delete_all').submit();
});
$(document).on('click', '#check_all', function(){
$('.checkbox_in_list').attr("checked", this.checked);
});
app/assets/stylesheets/bootstrap-orbit.css
Vendored
+14 -2
View File
@@ -1,5 +1,5 @@
/*bootstrap-orbit*/
/*bootstrap-orbit*/
h1, h2, h3, h4, h5, h6 {
font-weight:normal ;
}
@@ -112,6 +112,18 @@ table .span1-3 {
.qe-block .form-horizontal .form-actions {
text-align:right;
}
.form-actions form {
margin-bottom: 0;
}
.form-actions form input {
margin-bottom: 0;
}
.modal.fade {
top: -50%;
}
.form-search button {
margin-bottom: 0;
}
.modal form {
margin-bottom: 0;
}
app/assets/stylesheets/isotope.css
+52 -21
View File
@@ -1,18 +1,11 @@
/*isotope*/
/*isotope*/
#isotope {
margin-top: 2px;
background-color:#f4f4f4;
}
.isotope-item {
z-index: 2;
}
.isotope-hidden.isotope-item {
pointer-events: none;
z-index: 1;
}
/**** Isotope CSS3 transitions ****/
.isotope,
@@ -48,28 +41,27 @@
transition-duration: 0s;
}
.w-a {
width: 388px;
width: 398px;
}
.w-b {
width: 802px;
width: 812px;
}
.h-a {
height: 315px;
}
.h-b {
height: 699px;
height: 703px;
}
.item {
margin: 5px 0 15px 15px;
}
.item h3 {
margin: 5px 0;
margin: 20px 0 5px;
}
.item h3 [class^="icons-"] {
margin: 3px 5px 0 3px;
margin: 1px 5px 0 3px;
}
.item .detail {
padding: 5px;
border: 1px solid rgba(0, 0, 0, 0.1);
background-color: #FFFFFF;
border-radius: 5px;
@@ -77,12 +69,11 @@
-moz-border-radius: 5px;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
}
.item .detail .totle {
font-size: 50px;
padding:10px 5px 20px 0;
margin: 0px;
padding:10px 5px 30px 0;
margin: 0;
text-align: right;
border-bottom:1px solid #d9d9d9;
}
@@ -92,20 +83,60 @@
color: #333;
padding-left: 5px;
text-align:left;
margin-bottom: -7px;
}
.item .detail .table {
margin-bottom: 0;
}
.item .detail .table th, .item .detail .table td {
border-top: none;
border-bottom: 1px solid #DDDDDD;
}
.item .detail .table tr th {
background-color: #F2F2F2;
border-bottom: 1px solid #AAAAAA;
}
.item .detail .table tr td:first-child {
color: #666;;
}
.item .detail .table tr td:last-child {
.item .detail .table tr td:last-child, .item .detail .table tr th:last-child {
text-align:right;
padding-right: 15px;
}
.item .h-a .my_scroll .viewport {
height: 248px;
height: 210px;
}
.item .h-b .my_scroll .viewport {
height: 632px;
height: 594px;
}
.item .isotope-hidden.isotope-item {
pointer-events: none;
z-index: 1;
}
.item .my_scroll {
position: relative;
}
.item .my_scroll .scrollbar {
right: 3px;
top: 0;
position: absolute;
z-index: 10;
}
.item .my_scroll .track {
background-color: transparent;
}
.detail.noStatistics {
overflow: hidden;
}
.detail.noStatistics.h-a {
height: 315px;
}
.detail.noStatistics.h-a .my_scroll .viewport {
height: 280px;
}
.detail.noStatistics.h-b {
height: 704px;
}
.detail.noStatistics.h-b .my_scroll .viewport {
height: 670px;
}
app/assets/stylesheets/list.css
+19 -6
View File
@@ -22,7 +22,7 @@
.main-list .nav-pills > li > a {
border-radius: 5px 5px 5px 5px;
margin: 2px;
padding:5px
padding:5px;
}
.main-list tbody .quick-edit {
position:relative;
@@ -54,6 +54,11 @@
position: relative;
height: 40px;
}
.main-list .label-group .label {
margin-bottom: 1px;
display: inline-block;
padding: 0 3px;
}
.main-list .label-td {
background-color: rgba(255, 255, 255, 1);
height: 40px;
@@ -99,6 +104,7 @@
.qe-block td {
height:auto;
padding: 0;
/*background-color: #dedede;*/
}
.qe-block legend {
padding-left: 8px;
@@ -174,11 +180,18 @@ legend {
.sort-header th a:hover {
text-decoration: none;
}
#check_all_bulletins {
.list-remove {
position: absolute;
top: 10px;
left: 5px;
top: 0;
padding-top: 9px !important;
left: 25px;
}
#sort_headers .list-remove {
padding: 8px 0 8px 16px !important;
.form-fixed {
position: fixed;
margin-bottom: 0;
bottom: 0;
z-index: 10;
}
.paginationFixed {
margin-bottom: 25px;
}
app/assets/stylesheets/style.css.erb
+9 -11
View File
@@ -243,7 +243,7 @@
padding-right: 4px;
border-right: 1px solid rgba(0,0,0,.2);
position:fixed;
top: 32px;
top: 31px;
z-index: 88;
}
#main-sidebar .nav {
@@ -286,17 +286,18 @@
background-color: #FFF;
margin-left:160px;
padding-top: 32px;
padding-bottom: 18px;
/*padding-bottom: 18px;*/
position: relative;
min-height: 100%;
padding-bottom: 45px;
/*min-height: 100%;*/
}
#main-wrap > .form-actions {
/*#main-wrap > .form-actions {
background-color: #FFF;
text-align: center;
padding: 17px 20px 0;
margin: 0;
border-top: none;
}
}*/
#main-wrap .subnav {
height: auto;
min-height: 36px;
@@ -345,7 +346,7 @@
text-align: right;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0;
margin-bottom: -50px;
clear: both;
}
#poststuff form {
@@ -634,9 +635,6 @@
.adbanner-action {
margin-bottom: 20px;
}
#bulletin_link_qe form {
margin: 0;
}
[class^="icons-"] {
display: inline-block;
width: 16px;
@@ -925,5 +923,5 @@
}
/*21*/
.icons- {
background-position: -0px -640px;
}
background-position: -0px -640px
}