Skip to content

Commit

Permalink
Merge branch 'release/0.20'
Browse files Browse the repository at this point in the history
Conflicts:
  config/general.yml-example
  • Loading branch information
crowbot committed Dec 3, 2014
2 parents 479c9cd + d05082c commit 7414ed4
Show file tree
Hide file tree
Showing 176 changed files with 30,364 additions and 2,107 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem 'rails-i18n'
gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails'
# :require avoids "already initialized constant" warnings
gem 'rmagick', :require => 'RMagick'
gem 'ruby-msg', '~> 1.5.0'
gem 'ruby-msg', '~> 1.5.0', :git => 'git://github.com/mysociety/ruby-msg.git'
gem "statistics2", "~> 0.54"
gem 'syslog_protocol'
gem 'thin'
Expand All @@ -48,7 +48,7 @@ gem 'unidecoder'
group :assets do
gem 'bootstrap-sass'
gem 'sass-rails', '~> 3.2.3'
gem 'compass-rails'
gem 'compass-rails', '2.0.0'
gem 'coffee-rails', "~> 3.2.1"
gem 'uglifier', '>= 1.0.3'
gem 'therubyracer'
Expand Down
25 changes: 15 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ GIT
activerecord (>= 3.0.0)
paper_trail (~> 2)

GIT
remote: git://github.com/mysociety/ruby-msg.git
revision: ee0086add16c755d2eaf8dbcb90ba65809061cef
specs:
ruby-msg (1.5.2)
ruby-ole (>= 1.2.8)
vpim (>= 0.360)

GIT
remote: git://github.com/technoweenie/acts_as_versioned.git
revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b
Expand Down Expand Up @@ -58,7 +66,7 @@ GEM
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
charlock_holmes (0.6.9.4)
chunky_png (1.2.8)
chunky_png (1.3.3)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
Expand All @@ -72,8 +80,8 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
compass-rails (2.0.0)
compass (>= 0.12.2)
coveralls (0.6.7)
colorize
multi_json (~> 1.3)
Expand Down Expand Up @@ -154,7 +162,7 @@ GEM
net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
newrelic_rpm (3.9.1.236)
newrelic_rpm (3.9.7.266)
nokogiri (1.5.9)
paper_trail (2.7.2)
activerecord (~> 3.0)
Expand Down Expand Up @@ -216,10 +224,7 @@ GEM
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
ruby-msg (1.5.1)
ruby-ole (>= 1.2.8)
vpim (>= 0.360)
ruby-ole (1.2.11.6)
ruby-ole (1.2.11.7)
sass (3.2.10)
sass-rails (3.2.6)
railties (~> 3.2.0)
Expand Down Expand Up @@ -287,7 +292,7 @@ DEPENDENCIES
capistrano
charlock_holmes
coffee-rails (~> 3.2.1)
compass-rails
compass-rails (= 2.0.0)
coveralls
debugger
dynamic_form
Expand Down Expand Up @@ -323,7 +328,7 @@ DEPENDENCIES
routing-filter
rspec-rails
ruby-debug
ruby-msg (~> 1.5.0)
ruby-msg (~> 1.5.0)!
sass-rails (~> 3.2.3)
spork-rails
statistics2 (~> 0.54)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/javascripts/admin.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// ...
//= require jquery
//= require jquery.ui.tabs
//= require jquery.ui.sortable
//= require jquery.ui.effect-highlight
//= require admin/bootstrap-collapse
//= require admin/bootstrap-tab
//= require admin/admin
//= require admin/category-order
//= require jquery_ujs
42 changes: 42 additions & 0 deletions app/assets/javascripts/admin/category-order.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
$(function() {
$('.save-order').each(function(index){

// identify the elements that will work together
var save_button = $(this);
var save_notice = save_button.next();
var save_panel = save_button.parent();
var list_element = $(save_button.data('list-id'));
var endpoint = save_button.data('endpoint');

// on the first list change, show that there are unsaved changes
list_element.sortable({
update: function (event, ui) {
if (save_button.is('.disabled')){
save_button.removeClass("disabled");
save_notice.html(save_notice.data('unsaved-text'));
save_panel.effect('highlight', {}, 2000);
}
}
});
// on save, POST to endpoint
save_button.click(function(){
if (!save_button.is('.disabled')){
var data = list_element.sortable('serialize', {'attribute': 'data-id'});
var update_call = $.ajax({ data: data, type: 'POST', url: endpoint });

// on success, disable the save button again, and show success notice
update_call.done(function(msg) {
save_button.addClass('disabled');
save_panel.effect('highlight', {}, 2000);
save_notice.html(save_notice.data('success-text'));
})
// on failure, show error message
update_call.fail(function(jqXHR, msg) {
save_panel.effect('highlight', {'color': '#cc0000'}, 2000);
save_notice.html(save_notice.data('error-text') + jqXHR.responseText);
});
}
return false;
})
});
});
17 changes: 16 additions & 1 deletion app/assets/stylesheets/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,16 @@ body.admin {
}

.admin {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 20px;

@import "compass/css3";
@import "bootstrap";

#main {
margin-bottom: 50px;
padding-top: 50px;

}

.form-inline {
Expand All @@ -47,6 +50,9 @@ body.admin {

.accordion-group {
border: none;
div {
clear: both;
}
}
.accordion-heading {
.btn {
Expand Down Expand Up @@ -104,5 +110,14 @@ body.admin {
width: 750px;
}

.save-notice {
display: inline-block;
padding-left: 1em;
}

.category-list-item {
padding: 3px 0;
}

}

31 changes: 11 additions & 20 deletions app/assets/stylesheets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -586,26 +586,22 @@ width:40%;
width:26em;
}

#authority_preview {
width:45%;
float:right;
background-color:#FFFFE0;
padding-left:1em;
padding-right:1em;
overflow:hidden;
margin-top:-67px;
}

#authority_preview #header_left,#authority_preview.request_left,#authority_preview #stepwise_make_request {
width:95%;
}

#request_advice {
float:right;
width:250px;
margin-top:1em;
}

#select_authority_help {
background-color: #FEF1F6;
float: right;
margin-top: 31px;
overflow: hidden;
padding-left: 1em;
padding-right: 1em;
width: 45%;
}

#request_advice ul {
margin:0 auto;
}
Expand Down Expand Up @@ -1717,16 +1713,11 @@ width:575px;
padding-right:50px;
}

#authority_preview .request_left,
#authority_preview #header_left {
width: 100%;
}

#request_sidebar h2,.list-filter-item {
margin-bottom:10px;
}

div.ff-icon-printfix,.comment_in_request_text img.comment_quote,body.front #other-country-notice,#other-country-notice,#authority_preview .public-body-name-prefix,#authority_preview #list-filter,#authority_preview h2.foi_results,div#show_response_view p.event_actions, div.batch_public_body_toggle {
div.ff-icon-printfix,.comment_in_request_text img.comment_quote,body.front #other-country-notice,#other-country-notice,div#show_response_view p.event_actions, div.batch_public_body_toggle {
display:none;
}

Expand Down
3 changes: 3 additions & 0 deletions app/assets/stylesheets/responsive/_global_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ a {
&:focus {
color: #333333;
}
&:visited {
color: darken(#2688dc, 10%);
}
}

h1, h2, h3, h4, h5, h6 {
Expand Down
33 changes: 7 additions & 26 deletions app/assets/stylesheets/responsive/_new_request_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,48 +11,29 @@
@include lte-ie7 {
width: 27.125em;
}
#query {
width: 80%;
}
}
}

.new_info_request{
@include grid-row($behavior: nest);
}

#authority_preview {
#select_authority_help {
@include grid-column(12);
@include respond-min( $main_menu-mobile_menu_cutoff ){
@include respond-min( $main_menu-mobile_menu_cutoff ) {
@include grid-column(6);
margin-top:-67px;
@include ie8{
@include ie8 {
padding-right: 0.9375em;
}
@include lte-ie7 {
width: 26.188em;
}
}

/* Hide some elements of the public body that aren't appropriate in this
context */
#list-filter, h2.foi_results, .public-body-name-prefix {
display: none;
}

/* Compact request list for viewing in authority preview column */
.request_left, #header_left {
@include grid-column(12, $collapse: true);
}

.request_right {
@include grid-column(12, $collapse: true);
}

span.desc {
background:none;
line-height:18px;
padding: 0;
}

}

/* /new/[body_name] page */
#request_header {
@include grid-row;
Expand Down
7 changes: 7 additions & 0 deletions app/assets/stylesheets/responsive/_new_request_style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
/* Styles for pages in making a new request */

/* /select_authority page */
#select_authority_help {
.info {
font-style: italic;
}
}

/* /new/[body_name] page */
.new_info_request {
label {
Expand Down
9 changes: 9 additions & 0 deletions app/assets/stylesheets/responsive/_user_layout.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
/* Layout for user pages */

#user_profile_search {
#search_form {
margin-top: 2rem;
}

#request_latest_status {
width: 300px;
}
}
Loading

0 comments on commit 7414ed4

Please sign in to comment.