From f302e332a2c5723f716f18767cb60d0552fb2d64 Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Thu, 17 Oct 2013 12:11:42 -0700 Subject: [PATCH 001/107] Add personal information in db/seed.rb --- db/seeds.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index e0dd0308f..3a256581d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -96,18 +96,18 @@ end - factory :your_name_here, :parent => :person do + factory :david, :parent => :person do is_student 1 is_part_time 0 - graduation_year "2012" + graduation_year "2014" masters_program "SE" masters_track "Tech" - twiki_name "FirstLast" - first_name "First" - last_name "Last" - human_name "Your Name" - email "your.email@sv.cmu.edu" - webiso_account "your.name@andrew.cmu.edu" + twiki_name "DavidLee" + first_name "David" + last_name "Lee" + human_name "David Lee" + email "david.lee@sv.cmu.edu" + webiso_account "chihshal@andrew.cmu.edu" end end @@ -120,7 +120,7 @@ todd = Factory.create(:todd) ed = Factory.create(:ed) -Factory.create(:your_name_here) +Factory.create(:david) Factory.create(:team_terrific) #This will create awe_smith, betty_ross, and charlie_moss FactoryGirl.create(:presentation_feedback_questions, :label => "Content", :text => "Did the talk cover all the content suggested on the checklist? (ie goals, progress, and the process for achieving the goals, outcomes)") From a0b98c843a1f0c0019b306c0fbde3d146d26bccb Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Fri, 18 Oct 2013 18:11:06 -0700 Subject: [PATCH 002/107] Add accordion to grading queue --- Gemfile | 3 + Gemfile.lock | 17 ++ .../_deliverable_listing_professor.html.erb | 34 +++- .../grading_queue_for_course.html.erb | 23 ++- app/views/layouts/cmu_sv.html.erb | 5 + public/javascripts/collapse.js | 179 ++++++++++++++++++ public/javascripts/transition.js | 56 ++++++ public/stylesheets/bootstrap.min.css | 9 + 8 files changed, 314 insertions(+), 12 deletions(-) create mode 100755 public/javascripts/collapse.js create mode 100755 public/javascripts/transition.js create mode 100755 public/stylesheets/bootstrap.min.css diff --git a/Gemfile b/Gemfile index 3ed1d5117..65de57217 100644 --- a/Gemfile +++ b/Gemfile @@ -93,6 +93,9 @@ group :development, :test do # gem 'autotest-growl' if RUBY_PLATFORM =~ /darwin/ # gem 'test-unit' #, '1.2.3' #Downgrading so that autotest, rspec will work + +# Team Turing: add this for static code analysis + gem 'rails_best_practices' end diff --git a/Gemfile.lock b/Gemfile.lock index 345f150f3..c50335267 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,6 +52,7 @@ GEM addressable (2.3.4) archive-tar-minitar (0.5.2) arel (2.0.10) + awesome_print (1.2.0) aws-sdk (1.8.5) json (~> 1.4) nokogiri (>= 1.4.4) @@ -74,6 +75,9 @@ GEM mime-types (~> 1.16) orm_adapter (~> 0.0.5) cocaine (0.2.0) + code_analyzer (0.4.3) + sexp_processor + colored (1.2) columnize (0.3.6) daemons (1.1.9) delayed_job (2.1.4) @@ -182,6 +186,15 @@ GEM activesupport (= 3.0.20) bundler (~> 1.0) railties (= 3.0.20) + rails_best_practices (1.14.4) + activesupport + awesome_print + code_analyzer (>= 0.4.3) + colored + erubis + i18n + require_all + ruby-progressbar railties (3.0.20) actionpack (= 3.0.20) activesupport (= 3.0.20) @@ -192,6 +205,7 @@ GEM rdoc (3.12.2) json (~> 1.4) recaptcha (0.3.5) + require_all (1.3.1) rest-client (1.6.7) mime-types (>= 1.16) rmagick (2.13.2) @@ -221,6 +235,7 @@ GEM ruby-openid (2.2.3) ruby-openid-apps-discovery (1.2.0) ruby-openid (>= 2.1.7) + ruby-progressbar (1.2.0) ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) rubyzip (0.9.9) @@ -231,6 +246,7 @@ GEM rubyzip websocket (~> 1.0.4) sequel (3.20.0) + sexp_processor (4.4.0) shoulda (3.4.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (~> 1.0, >= 1.4.1) @@ -299,6 +315,7 @@ DEPENDENCIES pg rack-google_analytics rails (= 3.0.20) + rails_best_practices rake (= 0.8.7) rdoc recaptcha diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 12f702951..3126cd80d 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -1,5 +1,12 @@ <% reset_cycle %> <% customised_name= nomenclature_assignment_or_deliverable %> +
+
+
+ panel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-body +
+
+
@@ -21,7 +28,7 @@ <% deliverables.each do |deliverable| %> - + <% unless skip_course_column %> <% if deliverable.course %> @@ -48,20 +55,20 @@ - <% if deliverable.get_grade_status==:graded %> - - <%else%> - - <%end%> + <% if deliverable.get_grade_status==:graded %> + + <%else%> + + <%end%> + + + <% end %>
<%= h deliverable.course.name %> <% if deliverable.get_grade_status==:graded %> - Yes + Yes <% elsif deliverable.get_grade_status==:drafted %> - No (Draft) + No (Draft) <% elsif deliverable.get_grade_status==:ungraded %> - No + No <% end %> <%= link_to 'Review Grade', deliverable %><%= link_to 'Give Grade', deliverable %><%= link_to 'Review Grade', deliverable %><%= link_to 'Give Grade', deliverable %>
+
+
+ Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
+
+
diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index fd14e8797..a70f080a7 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -1,11 +1,15 @@

<%= @course.display_for_course_page %>

<%= render :partial=>"layouts/grade_book_sub_menu" %> + +
@@ -74,10 +78,11 @@ - + - + + +
+ +
+ +
<%= render :partial => "deliverable_listing_professor", :locals => {:deliverables => @deliverables, :skip_course_column => true} %> -
+ +
+
+
\ No newline at end of file diff --git a/app/views/layouts/cmu_sv.html.erb b/app/views/layouts/cmu_sv.html.erb index 4153ab1f2..5d4e8827a 100644 --- a/app/views/layouts/cmu_sv.html.erb +++ b/app/views/layouts/cmu_sv.html.erb @@ -32,6 +32,11 @@ <%= (title = yield :title) ? title : 'Silicon Valley Campus - Carnegie Mellon University' %> <%= yield :javascript %> <%= yield :head %> + + + <%= stylesheet_link_tag "/stylesheets/bootstrap.min.css", :media => "screen", :rel => "stylesheet" %> + <%= javascript_include_tag 'collapse.js', 'transition.js' %> + diff --git a/public/javascripts/collapse.js b/public/javascripts/collapse.js new file mode 100755 index 000000000..92cc0bc76 --- /dev/null +++ b/public/javascripts/collapse.js @@ -0,0 +1,179 @@ +/* ======================================================================== + * Bootstrap: collapse.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#collapse + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + $target.collapse(option) + }) + +}(window.jQuery); diff --git a/public/javascripts/transition.js b/public/javascripts/transition.js new file mode 100755 index 000000000..e8f318beb --- /dev/null +++ b/public/javascripts/transition.js @@ -0,0 +1,56 @@ +/* ======================================================================== + * Bootstrap: transition.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#transitions + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false, $el = this + $(this).one($.support.transition.end, function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(window.jQuery); diff --git a/public/stylesheets/bootstrap.min.css b/public/stylesheets/bootstrap.min.css new file mode 100755 index 000000000..a553c4f5e --- /dev/null +++ b/public/stylesheets/bootstrap.min.css @@ -0,0 +1,9 @@ +/*! + * Bootstrap v3.0.0 + * + * Copyright 2013 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + *//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h4,h5,h6{margin-top:10px;margin-bottom:10px}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}h1 small,.h1 small{font-size:24px}h2 small,.h2 small{font-size:18px}h3 small,.h3 small,h4 small,.h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-1{width:8.333333333333332%}.col-xs-2{width:16.666666666666664%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333333333%}.col-xs-5{width:41.66666666666667%}.col-xs-6{width:50%}.col-xs-7{width:58.333333333333336%}.col-xs-8{width:66.66666666666666%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333333334%}.col-xs-11{width:91.66666666666666%}.col-xs-12{width:100%}@media(min-width:768px){.container{max-width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-11{left:91.66666666666666%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-11{margin-left:91.66666666666666%}}@media(min-width:992px){.container{max-width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-1{width:8.333333333333332%}.col-md-2{width:16.666666666666664%}.col-md-3{width:25%}.col-md-4{width:33.33333333333333%}.col-md-5{width:41.66666666666667%}.col-md-6{width:50%}.col-md-7{width:58.333333333333336%}.col-md-8{width:66.66666666666666%}.col-md-9{width:75%}.col-md-10{width:83.33333333333334%}.col-md-11{width:91.66666666666666%}.col-md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.333333333333332%}.col-md-push-2{left:16.666666666666664%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333333333%}.col-md-push-5{left:41.66666666666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.333333333333336%}.col-md-push-8{left:66.66666666666666%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333333334%}.col-md-push-11{left:91.66666666666666%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-11{right:91.66666666666666%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-11{left:91.66666666666666%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-11{margin-left:91.66666666666666%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td{background-color:#d0e9c6;border-color:#c9e2b3}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td{background-color:#ebcccc;border-color:#e6c1c7}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td{background-color:#faf2cc;border-color:#f8e5be}@media(max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0;background-color:#fff}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{padding-top:7px;margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-print:before{content:"\e045"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-briefcase:before{content:"\1f4bc"}.glyphicon-calendar:before{content:"\1f4c5"}.glyphicon-pushpin:before{content:"\1f4cc"}.glyphicon-paperclip:before{content:"\1f4ce"}.glyphicon-camera:before{content:"\1f4f7"}.glyphicon-lock:before{content:"\1f512"}.glyphicon-bell:before{content:"\1f514"}.glyphicon-bookmark:before{content:"\1f516"}.glyphicon-fire:before{content:"\1f525"}.glyphicon-wrench:before{content:"\1f527"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent;content:""}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#428bca}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}}.nav-tabs.nav-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs.nav-justified>.active>a{border-bottom-color:#fff}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs-justified>.active>a{border-bottom-color:#fff}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;z-index:1000;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;border-width:0 0 1px}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;z-index:1030}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e6e6e6}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#fbeed5}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#eed3d7}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;left:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.affix{position:fixed}@-ms-viewport{width:device-width}@media screen and (max-width:400px){@-ms-viewport{width:320px}}.hidden{display:none!important;visibility:hidden!important}.visible-xs{display:none!important}tr.visible-xs{display:none!important}th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm{display:none!important}tr.visible-sm{display:none!important}th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md{display:none!important}tr.visible-md{display:none!important}th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg{display:none!important}tr.visible-lg{display:none!important}th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs{display:none!important}tr.hidden-xs{display:none!important}th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm{display:none!important}tr.hidden-xs.hidden-sm{display:none!important}th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md{display:none!important}tr.hidden-xs.hidden-md{display:none!important}th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg{display:none!important}tr.hidden-xs.hidden-lg{display:none!important}th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs{display:none!important}tr.hidden-sm.hidden-xs{display:none!important}th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}tr.hidden-sm{display:none!important}th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md{display:none!important}tr.hidden-sm.hidden-md{display:none!important}th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg{display:none!important}tr.hidden-sm.hidden-lg{display:none!important}th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs{display:none!important}tr.hidden-md.hidden-xs{display:none!important}th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm{display:none!important}tr.hidden-md.hidden-sm{display:none!important}th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}tr.hidden-md{display:none!important}th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg{display:none!important}tr.hidden-md.hidden-lg{display:none!important}th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs{display:none!important}tr.hidden-lg.hidden-xs{display:none!important}th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none!important}tr.hidden-lg.hidden-sm{display:none!important}th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none!important}tr.hidden-lg.hidden-md{display:none!important}th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg{display:none!important}tr.hidden-lg{display:none!important}th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print{display:none!important}tr.visible-print{display:none!important}th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print{display:none!important}tr.hidden-print{display:none!important}th.hidden-print,td.hidden-print{display:none!important}} \ No newline at end of file From 91f71629c631265a92e951cfd46d2e16fa189c59 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Fri, 18 Oct 2013 18:21:24 -0700 Subject: [PATCH 003/107] Model for filter by my teams --- app/controllers/deliverables_controller.rb | 9 ++- app/models/deliverable.rb | 66 ++++++++++++++++++++ app/services/grading_queue.rb | 0 spec_no_rails/services/grading_queue_spec.rb | 0 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 app/services/grading_queue.rb create mode 100644 spec_no_rails/services/grading_queue_spec.rb diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 7a02eafd9..1ce09383e 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -15,7 +15,9 @@ def index redirect_to my_deliverables_path(current_user) end + def grading_queue_for_course + @course = Course.find(params[:course_id]) if @course.grading_rule.nil? @@ -27,7 +29,12 @@ def grading_queue_for_course end if (current_user.is_admin? || @course.faculty.include?(current_user)) - @deliverables = Deliverable.where(:course_id => @course.id).all + + #@deliverables = Deliverable.where(:course_id => @course.id).all + + # Isil - Team Turing + @deliverables = Deliverable.new.grading_queue_display(params[:course_id], Assignment.find_by_course_id(params[:course_id]).id) + else has_permissions_or_redirect(:admin, root_path) end diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index d209a7b1b..055ffd51e 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -57,6 +57,72 @@ class Deliverable < ActiveRecord::Base after_save :inaccurate_course_and_assignment_check + attr_accessible :grading_queue_filter + + # Default configuration for grading queue filter: + @grading_queue_filter = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => 1, "deliverable_name" => ''} + + + # Grading queue + def grading_queue_display(course_id, assignment_id, options = @grading_queue_filter) + + queue = nil + + options = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => true, "deliverable_name" => ''} # DELETE THIS! + + # Check: Are there teams in this course? If there are, and the "filter by teams is on", filter by teams + # or by individuals in a faculty's teams. + + course_has_teams = Team.find_by_sql(["SELECT * FROM teams WHERE course_id = ? LIMIT 1", course_id]) + + if course_has_teams.nil? + # Show them everyone in the course + queue = Deliverable.where(:course_id => course_id).all + + else + # By default, the faculty see their teams or individuals in their teams with ungraded deliverables + if true + + sql = "SELECT a.name AS assignment_name, d.id AS deliverable_id, d.updated_at, a.task_number, + t.name AS owner, d.creator_id, dav.attachment_file_name, a.is_team_deliverable, + dav.id AS attachment_file_name + FROM deliverables d + INNER JOIN assignments a ON d.assignment_id = a.id + INNER JOIN teams t ON t.id = d.team_id + INNER JOIN courses c ON c.id = a.course_id + INNER JOIN faculty_assignments fa ON fa.course_id = c.id + INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id + WHERE d.course_id = ? AND a.id = ? AND t.primary_faculty_id = fa.user_id" + + queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) + + # This course may have teams, but this deliverable may not be a team deliverable. In that case: + if queue.nil? + sql = "SELECT a.name AS assignment_name, d.updated_at AS last_updated, a.task_number, + u.human_name AS owner, d.creator_id, dav.attachment_file_name, a.is_team_deliverable, + dav.id AS attachment_file_name + FROM deliverables d + INNER JOIN assignments a ON d.assignment_id = a.id + INNER JOIN users u ON u.id = d.creator_id + INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id + WHERE d.course_id = ? AND a.id = ?" + + queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) + + end # end 'Teams in course but individual deliverable' + + else + + # Do not filter by my teams, show everyone + queue = Deliverable.where(:course_id => course_id).all + + end # end 'Filter by my teams' + + end # end 'Course has teams ' + + return queue + + end # To get the owner of the deliverable def unique_course_task_owner? diff --git a/app/services/grading_queue.rb b/app/services/grading_queue.rb new file mode 100644 index 000000000..e69de29bb diff --git a/spec_no_rails/services/grading_queue_spec.rb b/spec_no_rails/services/grading_queue_spec.rb new file mode 100644 index 000000000..e69de29bb From d3d44ce94d4765208e6413d566e127c4c2d88f8b Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Sat, 19 Oct 2013 17:08:13 -0700 Subject: [PATCH 004/107] Model and view for 'Filter by my teams' --- app/controllers/deliverables_controller.rb | 2 +- app/models/deliverable.rb | 46 +++++++-------- .../_deliverable_listing_professor.html.erb | 56 ++++++++++++------- 3 files changed, 57 insertions(+), 47 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 1ce09383e..fa3c5da79 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -33,7 +33,7 @@ def grading_queue_for_course #@deliverables = Deliverable.where(:course_id => @course.id).all # Isil - Team Turing - @deliverables = Deliverable.new.grading_queue_display(params[:course_id], Assignment.find_by_course_id(params[:course_id]).id) + @deliverables = Deliverable.new.grading_queue_display(params[:course_id], current_user.id) else has_permissions_or_redirect(:admin, root_path) diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index 055ffd51e..b326dc90c 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -57,50 +57,45 @@ class Deliverable < ActiveRecord::Base after_save :inaccurate_course_and_assignment_check - attr_accessible :grading_queue_filter - - # Default configuration for grading queue filter: - @grading_queue_filter = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => 1, "deliverable_name" => ''} - # Grading queue - def grading_queue_display(course_id, assignment_id, options = @grading_queue_filter) + def grading_queue_display(course_id, faculty_id, options = nil) - queue = nil + # Default grading queue filters + options = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => 1, "deliverable_name" => ''} if options.nil? - options = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => true, "deliverable_name" => ''} # DELETE THIS! + queue = nil # Check: Are there teams in this course? If there are, and the "filter by teams is on", filter by teams # or by individuals in a faculty's teams. course_has_teams = Team.find_by_sql(["SELECT * FROM teams WHERE course_id = ? LIMIT 1", course_id]) - if course_has_teams.nil? + if course_has_teams.empty? # Show them everyone in the course - queue = Deliverable.where(:course_id => course_id).all + #queue = Deliverable.where(:course_id => course_id).all + queue = Deliverable.find_by_sql(["SELECT * FROM deliverables WHERE course_id = ?", course_id]) else # By default, the faculty see their teams or individuals in their teams with ungraded deliverables - if true + if options['is_my_teams'] == 1 - sql = "SELECT a.name AS assignment_name, d.id AS deliverable_id, d.updated_at, a.task_number, - t.name AS owner, d.creator_id, dav.attachment_file_name, a.is_team_deliverable, - dav.id AS attachment_file_name - FROM deliverables d - INNER JOIN assignments a ON d.assignment_id = a.id - INNER JOIN teams t ON t.id = d.team_id - INNER JOIN courses c ON c.id = a.course_id - INNER JOIN faculty_assignments fa ON fa.course_id = c.id - INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id - WHERE d.course_id = ? AND a.id = ? AND t.primary_faculty_id = fa.user_id" + sql = "SELECT a.name AS assignment_name, d.id AS deliverable_id, d.updated_at, a.task_number, t.name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable, dav.id AS attachment_versions, c.name AS course_name + FROM deliverables d + INNER JOIN assignments a ON d.assignment_id = a.id + INNER JOIN teams t ON t.id = d.team_id + INNER JOIN courses c ON c.id = a.course_id + INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id + WHERE d.course_id = ? AND t.primary_faculty_id = ?" - queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) + #queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) + queue = Deliverable.find_by_sql([sql, course_id, faculty_id]) # This course may have teams, but this deliverable may not be a team deliverable. In that case: if queue.nil? sql = "SELECT a.name AS assignment_name, d.updated_at AS last_updated, a.task_number, - u.human_name AS owner, d.creator_id, dav.attachment_file_name, a.is_team_deliverable, - dav.id AS attachment_file_name + u.human_name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable, + dav.id AS attachment_versions FROM deliverables d INNER JOIN assignments a ON d.assignment_id = a.id INNER JOIN users u ON u.id = d.creator_id @@ -114,7 +109,8 @@ def grading_queue_display(course_id, assignment_id, options = @grading_queue_fil else # Do not filter by my teams, show everyone - queue = Deliverable.where(:course_id => course_id).all + #queue = Deliverable.where(:course_id => course_id).all + queue = Deliverable.find_by_sql(["SELECT * FROM deliverables WHERE course_id = ?", course_id]) end # end 'Filter by my teams' diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 3126cd80d..34e71ba70 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -1,5 +1,19 @@ <% reset_cycle %> <% customised_name= nomenclature_assignment_or_deliverable %> + +<% if deliverables.nil? %> +

No deliverables!

+<% else %> + <% deliverables.each do |deliverable| %> +

<%= deliverable.attributes['task_number'] %>

+

<%= deliverable.attributes['owner_name'] %>

+

<%= deliverable.attributes['assignment_name'] %>

+

<%= deliverable.attributes['updated_at'] %>

+

<%= deliverable.get_grade_status %>

+ <% end %> +<% end %> + +
@@ -28,7 +42,7 @@ <% deliverables.each do |deliverable| %> - + <% unless skip_course_column %> <% if deliverable.course %> <%= h deliverable.course.name %> @@ -44,43 +58,43 @@ <%= h deliverable.assignment.task_number %> <% end %> <% end %> - <%= "Team " if deliverable.is_team_deliverable? %><%= deliverable.owner_name %> - <% latest_attachment = deliverable.attachment_versions.first %> - <% unless latest_attachment.attachment_file_name.nil? %> - <%= deliverable.assignment_name%> (<%= link_to "download", latest_attachment.attachment.url %>) - <% else %> - <%= deliverable.assignment_name %> - <% end %> + <%#= "Team " if deliverable.is_team_deliverable? %><%#= deliverable.attributes[:owner] %> + <%# latest_attachment = deliverable.attributes[:attachment_versions] %> + <%# unless latest_attachment.attributes[:attachment_file_name].nil? %> + <%#= deliverable.assignment_name %> (<%#= link_to "download", latest_attachment.attachment.url %>) + <%# else %> + <%#= deliverable.assignment_name %> + <% #end %> - <% if deliverable.get_grade_status==:graded %> + <% #if deliverable.get_grade_status==:graded %> Yes - <% elsif deliverable.get_grade_status==:drafted %> + <% #elsif deliverable.get_grade_status==:drafted %> No (Draft) - <% elsif deliverable.get_grade_status==:ungraded %> + <% #elsif deliverable.get_grade_status==:ungraded %> No - <% end %> + <% #end %> - <% if deliverable.get_grade_status==:graded %> - <%= link_to 'Review Grade', deliverable %> - <%else%> - <%= link_to 'Give Grade', deliverable %> - <%end%> + <% #if #deliverable.get_grade_status==:graded %> + <%#= link_to 'Review Grade', deliverable %> + <%#else%> + <%#= link_to 'Give Grade', deliverable %> + <%#end%> -
+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
From d2d3fae14044e43059b0a18f84c6460cf1ff56c9 Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Sun, 20 Oct 2013 13:58:04 -0700 Subject: [PATCH 005/107] Add test case for filtering by MY teams/students --- app/controllers/deliverables_controller.rb | 6 +- db/seeds.rb | 18 +- .../deliverables_controller_spec.rb | 263 +++++++++++------- spec/factories/assignments.rb | 14 + spec/factories/deliverable_attachments.rb | 15 + spec/factories/deliverables.rb | 25 ++ spec/factories/teams.rb | 30 ++ spec/factories/users.rb | 15 + 8 files changed, 272 insertions(+), 114 deletions(-) create mode 100644 spec/factories/deliverable_attachments.rb diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index fa3c5da79..f2ae10571 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -28,10 +28,10 @@ def grading_queue_for_course flash.now[:error] = I18n.t(:default_grading_rule_for_course) end - if (current_user.is_admin? || @course.faculty.include?(current_user)) - - #@deliverables = Deliverable.where(:course_id => @course.id).all + if current_user.is_admin? + @deliverables = Deliverable.where(:course_id => @course.id).all + elsif @course.faculty.include?(current_user) # Isil - Team Turing @deliverables = Deliverable.new.grading_queue_display(params[:course_id], current_user.id) diff --git a/db/seeds.rb b/db/seeds.rb index 3a256581d..e0dd0308f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -96,18 +96,18 @@ end - factory :david, :parent => :person do + factory :your_name_here, :parent => :person do is_student 1 is_part_time 0 - graduation_year "2014" + graduation_year "2012" masters_program "SE" masters_track "Tech" - twiki_name "DavidLee" - first_name "David" - last_name "Lee" - human_name "David Lee" - email "david.lee@sv.cmu.edu" - webiso_account "chihshal@andrew.cmu.edu" + twiki_name "FirstLast" + first_name "First" + last_name "Last" + human_name "Your Name" + email "your.email@sv.cmu.edu" + webiso_account "your.name@andrew.cmu.edu" end end @@ -120,7 +120,7 @@ todd = Factory.create(:todd) ed = Factory.create(:ed) -Factory.create(:david) +Factory.create(:your_name_here) Factory.create(:team_terrific) #This will create awe_smith, betty_ross, and charlie_moss FactoryGirl.create(:presentation_feedback_questions, :label => "Content", :text => "Did the talk cover all the content suggested on the checklist? (ie goals, progress, and the process for achieving the goals, outcomes)") diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index 727d33c5f..553f6ef20 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -3,18 +3,26 @@ describe DeliverablesController do - before do - @admin_andy = FactoryGirl.create(:admin_andy) - @faculty_frank = FactoryGirl.create(:faculty_frank_user) - @faculty_fagan = FactoryGirl.create(:faculty_fagan) - @student_sam = FactoryGirl.create(:student_sam) - @student_sally = FactoryGirl.create(:student_sally) - end + before do + @admin_andy = FactoryGirl.create(:admin_andy) + @faculty_frank = FactoryGirl.create(:faculty_frank_user) + @faculty_fagan = FactoryGirl.create(:faculty_fagan) + @student_sam = FactoryGirl.create(:student_sam) + @student_sally = FactoryGirl.create(:student_sally) + + + end - describe "GET index for course" do + describe "GET index for course" do + + ## beg del turing +=begin before(:each) do + + @course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 42) @deliverable = stub_model(Deliverable, :course_id => @course.id) + Deliverable.stub_chain(:where, :all).and_return([@deliverable, @deliverable]) @course.stub(:grading_rule).and_return(true) @@ -32,135 +40,186 @@ get :grading_queue_for_course, :course_id => @course.id assigns(:deliverables).should == [@deliverable, @deliverable] end - end +=end + ## end del turing - context "as an admin" do + ## beg add turing + before(:each) do + @course = FactoryGirl.create(:fse, faculty: [@faculty_frank]) + @assignment1 = FactoryGirl.create(:assignment_1,:course => @course) + @assignment2 = FactoryGirl.create(:assignment_1,:course => @course) - before do - login(@admin_andy) - end + @team_turing = FactoryGirl.create(:team_turing, :course=>@course) + @team_test = FactoryGirl.create(:team_test, :course=>@course) - it 'assigns @deliverables' do - get :grading_queue_for_course, :course_id => @course.id - assigns(:deliverables).should == [@deliverable, @deliverable] - end + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment1) + @deliverable2 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment2) + @deliverable3 = FactoryGirl.create(:team_test_deliverable_1,:course => @course, :team => @team_test,:assignment => @assignment1) + + @dav1 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) + @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sam) + @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sam) + + @course.stub(:grading_rule).and_return(true) + @course.stub_chain(:grading_rule, :default_values?).and_return(true) + Course.stub(:find).and_return(@course) + + end + + context "as the faculty owner of the course" do + before do + Deliverable.stub(:grading_queue_display).and_return([@deliverable1,@deliverable2]) + login(@faculty_frank) end - context "as any other user" do - before do - login(@faculty_fagan) - get :grading_queue_for_course, :course_id => @course.id - end - it_should_behave_like "permission denied" + it 'shows deliverables of only my teams' do + get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id + @deliver = assigns(:deliverables) + @deliver.should have(2).items + (@deliver[0].deliverable_id).to_i.should == @deliverable2.id + (@deliver[1].deliverable_id).to_i.should == @deliverable1.id end + + ## end add turing + end - describe "GET my_deliverables" do - before(:each) do - @course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 42) - @past_course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 41) - @deliverable = stub_model(Deliverable, :course_id => @course.id, :owner_id => @student_sam.id) - @current_assignment = stub_model(Assignment, :course_id => @course.id) - @past_assignment = stub_model(Assignment, :course_id => @past_course.id) - Deliverable.stub(:find_current_by_user).and_return([@deliverable, @deliverable]) - Deliverable.stub(:find_past_by_user).and_return([@deliverable, @deliverable]) - Assignment.stub(:list_assignments_for_student).with(@student_sam.id , :current).and_return([@current_assignment]) - Assignment.stub(:list_assignments_for_student).with(@student_sam.id , :past).and_return([@past_assignment]) - Course.stub(:find).and_return(@course) - User.any_instance.stub(:registered_for_these_courses_during_current_semester).and_return([@course]) - User.any_instance.stub(:registered_for_these_courses_during_past_semesters).and_return([@past_course]) + context "as an admin" do + before do + ## beg add turing + Deliverable.stub(:grading_queue_display).and_return([@deliverable3,@deliverable2,@deliverable1]) + ## end add turing + login(@admin_andy) end - context "as the owner of the deliverable" do - before do - login(@student_sam) - end + it 'assigns @deliverables' do + ## beg chg turing + # get :grading_queue_for_course, :course_id => @course.id + # assigns(:deliverables).should == [@deliverable, @deliverable] - it 'assigns deliverables' do - get :my_deliverables, :id => @student_sam.id - #assigns(:current_deliverables).should == [@deliverable, @deliverable] - #assigns(:past_deliverables).should == [@deliverable, @deliverable] - assigns(:current_courses).should == [@course] - assigns(:past_courses).should == [@past_course] - assigns(:current_assignments).should == [@current_assignment] - assigns(:past_assignments).should == [@past_assignment] - end + get :grading_queue_for_course, :course_id => @course.id + assigns(:deliverables).should == [@deliverable3, @deliverable2, @deliverable1] + ## end chg turing end + end - context "as an faculty" do + context "as any other user" do + before do + login(@faculty_fagan) + get :grading_queue_for_course, :course_id => @course.id + end - before do - login(@faculty_frank) - end + it_should_behave_like "permission denied" + end + end + + + describe "GET my_deliverables" do + before(:each) do + @course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 42) + @past_course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 41) + @deliverable = stub_model(Deliverable, :course_id => @course.id, :owner_id => @student_sam.id) + @current_assignment = stub_model(Assignment, :course_id => @course.id) + @past_assignment = stub_model(Assignment, :course_id => @past_course.id) + Deliverable.stub(:find_current_by_user).and_return([@deliverable, @deliverable]) + Deliverable.stub(:find_past_by_user).and_return([@deliverable, @deliverable]) + Assignment.stub(:list_assignments_for_student).with(@student_sam.id , :current).and_return([@current_assignment]) + Assignment.stub(:list_assignments_for_student).with(@student_sam.id , :past).and_return([@past_assignment]) + Course.stub(:find).and_return(@course) + User.any_instance.stub(:registered_for_these_courses_during_current_semester).and_return([@course]) + User.any_instance.stub(:registered_for_these_courses_during_past_semesters).and_return([@past_course]) + end - it 'assigns @deliverables' do - get :my_deliverables, :id => @student_sam.id - assigns(:current_deliverables).should == [@deliverable, @deliverable] - assigns(:past_deliverables).should == [@deliverable, @deliverable] - end + context "as the owner of the deliverable" do + before do + login(@student_sam) end - context "as any other student" do - before do - login(@student_sally) - get :my_deliverables, :id => @student_sam.id - end - - it_should_behave_like "permission denied for person deliverable" + it 'assigns deliverables' do + get :my_deliverables, :id => @student_sam.id + #assigns(:current_deliverables).should == [@deliverable, @deliverable] + #assigns(:past_deliverables).should == [@deliverable, @deliverable] + assigns(:current_courses).should == [@course] + assigns(:past_courses).should == [@past_course] + assigns(:current_assignments).should == [@current_assignment] + assigns(:past_assignments).should == [@past_assignment] end end + context "as an faculty" do - describe "GET show" do - before(:each) do - @course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 42) - @current_assignment = mock_model(Assignment, :course_id => @course.id, :is_team_deliverable => true) - @deliverable = stub_model(Deliverable, :course_id => @course.id, :owner_id => @student_sam.id, :assignment=>@current_assignment) - @team = stub_model(Team) - Deliverable.stub(:find).and_return(@deliverable) - @deliverable.stub(:team).and_return(@team) + before do + login(@faculty_frank) + end - @course.stub(:grading_rule).and_return(true) - @course.stub_chain(:grading_rule, :default_values?).and_return(true) - Course.stub(:find).and_return(@course) + it 'assigns @deliverables' do + get :my_deliverables, :id => @student_sam.id + assigns(:current_deliverables).should == [@deliverable, @deliverable] + assigns(:past_deliverables).should == [@deliverable, @deliverable] end + end - context "for a team deliverable" do + context "as any other student" do + before do + login(@student_sally) + get :my_deliverables, :id => @student_sam.id + end - it 'the owner can see it' do - login(@student_sam) - @team.stub(:is_user_on_team?).and_return(true) - get :show, :id => @deliverable.id - assigns(:deliverable).should == @deliverable - end + it_should_behave_like "permission denied for person deliverable" + end + end - it "someone else on the team can see it" do - login(@student_sam) - @team.stub(:is_user_on_team?).and_return(true) - get :show, :id => @deliverable.id - assigns(:deliverable).should == @deliverable - end - it "any faculty can see it" do - login(@faculty_frank) + describe "GET show" do + before(:each) do + @course = mock_model(Course, :faculty => [@faculty_frank], :course_id => 42) + @current_assignment = mock_model(Assignment, :course_id => @course.id, :is_team_deliverable => true) + @deliverable = stub_model(Deliverable, :course_id => @course.id, :owner_id => @student_sam.id, :assignment=>@current_assignment) + @team = stub_model(Team) + Deliverable.stub(:find).and_return(@deliverable) + @deliverable.stub(:team).and_return(@team) + + @course.stub(:grading_rule).and_return(true) + @course.stub_chain(:grading_rule, :default_values?).and_return(true) + Course.stub(:find).and_return(@course) + end + + context "for a team deliverable" do + + it 'the owner can see it' do + login(@student_sam) + @team.stub(:is_user_on_team?).and_return(true) + get :show, :id => @deliverable.id + assigns(:deliverable).should == @deliverable + end + + it "someone else on the team can see it" do + login(@student_sam) + @team.stub(:is_user_on_team?).and_return(true) + get :show, :id => @deliverable.id + assigns(:deliverable).should == @deliverable + end + + it "any faculty can see it" do + login(@faculty_frank) + @team.stub(:is_user_on_team?).and_return(false) + get :show, :id => @deliverable.id + assigns(:deliverable).should == @deliverable + end + + context "no other student can see it" do + before do @team.stub(:is_user_on_team?).and_return(false) + login(@student_sally) get :show, :id => @deliverable.id - assigns(:deliverable).should == @deliverable end - context "no other student can see it" do - before do - @team.stub(:is_user_on_team?).and_return(false) - login(@student_sally) - get :show, :id => @deliverable.id - end - - it_should_behave_like "permission denied for person deliverable" - end + it_should_behave_like "permission denied for person deliverable" end end + end # describe "GET edit" do diff --git a/spec/factories/assignments.rb b/spec/factories/assignments.rb index 0bcaf45b9..3478405ad 100644 --- a/spec/factories/assignments.rb +++ b/spec/factories/assignments.rb @@ -26,4 +26,18 @@ sequence(:maximum_score) {|i| i*3} sequence(:assignment_order) {|i| i} end + + ## beg add turing + + factory :assignment_1, :parent=>:assignment do + is_team_deliverable true + association :course, :factory => :fse + end + + factory :assignment_2, :parent=>:assignment do + is_team_deliverable true + association :course, :factory => :fse + end + + ## end add turing end diff --git a/spec/factories/deliverable_attachments.rb b/spec/factories/deliverable_attachments.rb new file mode 100644 index 000000000..9110e653a --- /dev/null +++ b/spec/factories/deliverable_attachments.rb @@ -0,0 +1,15 @@ +FactoryGirl.define do + + ## beg add turing + + factory :attachment_1, :parent => :deliverable_attachment do + submitter_id 1 + deliverable_id 1 + submission_date DateTime.now + association :deliverable, :factory => :team_deliverable + association :submitter, :factory => :student_john_user + + end + + ## end add turing +end \ No newline at end of file diff --git a/spec/factories/deliverables.rb b/spec/factories/deliverables.rb index d6c37bb82..49ab06a26 100644 --- a/spec/factories/deliverables.rb +++ b/spec/factories/deliverables.rb @@ -14,5 +14,30 @@ private_note "My private notes" end + ## beg add turing + factory :team_turing_deliverable_1, :parent => :deliverable do + association :assignment, :factory => :assignment + association :team, :factory => :team_turing + association :creator, :factory => :student_john_user + association :course, :factory => :fse + private_note "My first deliverable" + end + + factory :team_turing_deliverable_2, :parent => :deliverable do + association :assignment, :factory => :assignment + association :team, :factory => :team_turing + association :creator, :factory => :student_john_user + association :course, :factory => :fse + private_note "My second deliverable" + end + + factory :team_test_deliverable_1, :parent => :deliverable do + association :assignment, :factory => :assignment + association :team, :factory => :team_test + association :course, :factory => :fse + association :creator, :factory => :student_Test_user + private_note "Test team first deliverable" + end + ## end add turing end diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb index f87e6bc66..2de8cf733 100644 --- a/spec/factories/teams.rb +++ b/spec/factories/teams.rb @@ -22,4 +22,34 @@ association :course, :factory => :course end + ## beg add turing + factory :team_turing, class: Team do + name "Turing" + email "turing@sv.cmu.edu" + primary_faculty_id 46 + updating_email false + tigris_space "http://team.turing.org/servlets/ProjectDocumentList" + twiki_space "http://info.sv.cmu.edu/twiki/bin/view/Graffiti/WebHome" + + association :course, :factory => :fse + + after(:create) { |team| FactoryGirl.create(:student_john_user , :teams => [team])} + + end + + + factory :team_test, class: Team do + name "Test" + email "test@sv.cmu.edu" + primary_faculty_id 47 + updating_email false + tigris_space "http://team.test.org/servlets/ProjectDocumentList" + twiki_space "http://info.sv.cmu.edu/twiki/bin/view/Graffiti/WebHome" + + association :course, :factory => :fse + + + end + + ## end add turing end \ No newline at end of file diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 01c5e6a49..6b79d5f06 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -122,4 +122,19 @@ track_group "Tech" end + + ## beg add turing + factory :student_Test_user, :parent => :user do + sequence(:email) {|i| "student_Test#{i}@sv.cmu.edu"} + sequence(:webiso_account) {|i| "student_Test#{i}@andrew.cmu.edu"} + sequence(:human_name) {|i| "student_Test#{i}"} + sequence(:first_name) {|i| "student_Test#{i}"} + sequence(:last_name) {|i| "student_Test#{i}"} + sequence(:twiki_name) {|i| "student_Test#{i}"} + is_student true + is_alumnus false + end + + ## end add turing + end \ No newline at end of file From 6311da3ce167ef4dbef5915a6bee53194ccf5fd3 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Mon, 21 Oct 2013 11:15:33 -0700 Subject: [PATCH 006/107] Admin should be able to see every deliverable in a course --- app/controllers/deliverables_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index fa3c5da79..21dc5f3d8 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -28,7 +28,11 @@ def grading_queue_for_course flash.now[:error] = I18n.t(:default_grading_rule_for_course) end - if (current_user.is_admin? || @course.faculty.include?(current_user)) + if current_user.is_admin? + + @deliverables = Deliverable.where(:course_id => @course.id).all + + elsif @course.faculty.include?(current_user) #@deliverables = Deliverable.where(:course_id => @course.id).all From 460ea927ac798514eba6aadf290556e724cf8192 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 21 Oct 2013 15:54:56 -0700 Subject: [PATCH 007/107] Changing notifiers for Travis --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a255982b..3b77385bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,10 @@ env: notifications: email: recipients: - - todd.sedano@sv.cmu.edu - - rofaida.abdelaal@sv.cmu.edu + - emilia.torino@sv.cmu.edu + #- todd.sedano@sv.cmu.edu + #- rofaida.abdelaal@sv.cmu.edu # on_success: [always|never|change] # default: change # on_failure: [always|never|change] # default: always - on_success: change + on_success: always on_failure: always From ba27ee5137f641ab4abbc4aab33d713b53c50d1d Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 21 Oct 2013 16:07:55 -0700 Subject: [PATCH 008/107] Adding comment just to sync with Travis --- spec/controllers/deliverables_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index 553f6ef20..75929ef94 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -81,7 +81,7 @@ (@deliver[1].deliverable_id).to_i.should == @deliverable1.id end - ## end add turing + ## end add Team turing end From 3bc5b824a58ed36cf36d38c3821be9ca782dd8c9 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 21 Oct 2013 17:52:43 -0700 Subject: [PATCH 009/107] Adding team turing for build notifications --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b77385bc..fcdddeb9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: notifications: email: recipients: - - emilia.torino@sv.cmu.edu + - fall-2013-turing@west.cmu.edu #- todd.sedano@sv.cmu.edu #- rofaida.abdelaal@sv.cmu.edu # on_success: [always|never|change] # default: change From 6f8c4303986ba1211da9ba71e06d220d15b36fb4 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 21 Oct 2013 23:19:43 -0700 Subject: [PATCH 010/107] Adding comment just to sync with Travis --- spec/controllers/deliverables_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index 75929ef94..e309bbf73 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -43,7 +43,7 @@ =end ## end del turing - ## beg add turing + ## beg add Team turing before(:each) do @course = FactoryGirl.create(:fse, faculty: [@faculty_frank]) @assignment1 = FactoryGirl.create(:assignment_1,:course => @course) From 076c205db2a81aac90df418c37d4bd7ffaf22432 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 21 Oct 2013 23:33:16 -0700 Subject: [PATCH 011/107] Adding each team turing members for build notifications --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcdddeb9c..8dae2c3db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,11 @@ env: notifications: email: recipients: - - fall-2013-turing@west.cmu.edu + - emilia.torino@west.cmu.edu + - mia.manalastas@sv.cmu.edu + - ira.jain@sv.cmu.edu + - david.lee@sv.cmu.edu + - isil.demir@sv.cmu.edu #- todd.sedano@sv.cmu.edu #- rofaida.abdelaal@sv.cmu.edu # on_success: [always|never|change] # default: change From a55beafc3958c33329494b9874d4d14abc411581 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 23 Oct 2013 15:34:38 -0700 Subject: [PATCH 012/107] Service test code for spec_no_rails --- spec/services/grading_queue_spec.rb | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 spec/services/grading_queue_spec.rb diff --git a/spec/services/grading_queue_spec.rb b/spec/services/grading_queue_spec.rb new file mode 100644 index 000000000..92c7f2007 --- /dev/null +++ b/spec/services/grading_queue_spec.rb @@ -0,0 +1,35 @@ +# This spec is contributed by Team Turing +require 'spec_helper' +require_relative '../../app/services/grading_queue.rb' +#require_relative '../../spec/factories/users.rb' +#require_relative '../../spec/factories/teams.rb' +#require_relative '../../spec/factories/deliverables.rb' + +describe GradingQueue do + + let(:class_with_grading_queue) { + Class.new do + include GradingQueue + + end + } + + describe 'filtering grading queue' do + + before do + + @faculty = FactoryGirl.create(:faculty_snape_user) + @team = FactoryGirl.create(:team_turing) + @deliverable = FactoryGirl.create(:team_turing_deliverable) + + end + + it 'should be filtered by my students/teams and ungraded' do + test_class = class_with_grading_queue.new + test_class.deliverable_by_team.should == deliverable + end + + end + + +end From d62ea71d058868dcd39e5ebd64092e71d0df725e Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 23 Oct 2013 15:39:31 -0700 Subject: [PATCH 013/107] Updated gitignore to exclude 'logfile' --- .gitignore | 3 ++ logfile | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 logfile diff --git a/.gitignore b/.gitignore index 488c33550..1b9862181 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ push*.dat # Vagrant files .vagrant + +#postgres +logfile diff --git a/logfile b/logfile new file mode 100644 index 000000000..70cf896e0 --- /dev/null +++ b/logfile @@ -0,0 +1,95 @@ +LOG: database system was shut down at 2013-10-02 15:19:32 PDT +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +FATAL: database "mariaemiliatorino" does not exist +ERROR: role "metorino" does not exist +STATEMENT: CREATE DATABASE cmu_education OWNER metorino ENCODING 'UTF8'; + +LOG: received fast shutdown request +LOG: aborting any active transactions +LOG: autovacuum launcher shutting down +LOG: shutting down +LOG: database system is shut down +LOG: database system was shut down at 2013-10-02 16:02:46 PDT +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +ERROR: role "metorino" does not exist +STATEMENT: CREATE DATABASE cmu_education OWNER metorino ENCODING 'UTF8'; + +ERROR: role "metorino" does not exist +STATEMENT: CREATE DATABASE cmu_education OWNER metorino ENCODING 'UTF8'; + +LOG: received fast shutdown request +LOG: aborting any active transactions +LOG: autovacuum launcher shutting down +LOG: shutting down +LOG: database system is shut down +LOG: database system was shut down at 2013-10-02 16:06:57 PDT +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +ERROR: role "metorino" does not exist +STATEMENT: CREATE DATABASE cmu_education OWNER metorino ENCODING 'UTF8'; + +FATAL: role "postgres" does not exist +FATAL: database "du" does not exist +ERROR: role "metorino" does not exist +STATEMENT: CREATE DATABASE cmu_education OWNER metorino ENCODING 'UTF8'; + +ERROR: role "Emi" does not exist +STATEMENT: CREATE DATABASE cmu_education OWNER "Emi" ENCODING 'UTF8'; + +FATAL: role "root" does not exist +FATAL: role "root" does not exist +FATAL: role "postgres" does not exist +FATAL: database "cmu_education_test" does not exist +LOG: autovacuum launcher shutting down +LOG: received smart shutdown request +LOG: shutting down +LOG: database system is shut down +LOG: database system was shut down at 2013-10-02 17:16:07 PDT +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +FATAL: database "cmu_education_test" does not exist +FATAL: terminating connection due to administrator command +LOG: autovacuum launcher shutting down +LOG: received smart shutdown request +LOG: shutting down +LOG: database system is shut down +LOG: database system was shut down at 2013-10-03 10:00:58 PDT +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +FATAL: database "cmu_education_test" does not exist +LOG: automatic vacuum of table "cmu_education_test.public.users": could not (re)acquire exclusive lock for truncate scan +LOG: database system was interrupted; last known up at 2013-10-03 10:08:16 PDT +LOG: database system was not properly shut down; automatic recovery in progress +LOG: record with zero length at 0/293B450 +LOG: redo is not required +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +FATAL: lock file "postmaster.pid" already exists +HINT: Is another postmaster (PID 1422) running in data directory "/usr/local/var/postgres"? +ERROR: column "SeverusSnape" does not exist at character 31 +STATEMENT: update users set twiki_name = "SeverusSnape" where id=29 +ERROR: column "SeverusSnape" does not exist at character 31 +STATEMENT: update users set twiki_name = "SeverusSnape" where id=29 +LOG: received smart shutdown request +LOG: autovacuum launcher shutting down +LOG: shutting down +LOG: database system is shut down +LOG: database system was shut down at 2013-10-16 05:51:07 PDT +LOG: database system is ready to accept connections +LOG: autovacuum launcher started +FATAL: lock file "postmaster.pid" already exists +HINT: Is another postmaster (PID 1288) running in data directory "/usr/local/var/postgres"? +LOG: automatic vacuum of table "cmu_education_test.public.registrations": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.user_versions": could not (re)acquire exclusive lock for truncate scan +FATAL: database "cmu_education_test" does not exist +LOG: automatic vacuum of table "cmu_education_test.public.courses": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.registrations": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.users": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.delayed_jobs": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.registrations": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.teams": could not (re)acquire exclusive lock for truncate scan +LOG: automatic vacuum of table "cmu_education_test.public.users": could not (re)acquire exclusive lock for truncate scan +FATAL: database "cmu_education_test" does not exist +FATAL: database "cmu_education_test" does not exist From 5e0e8a7719ec142e91b78fbcba12618cfea5cc3a Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 23 Oct 2013 21:07:54 -0700 Subject: [PATCH 014/107] Refactoring on filter by teams story. Changing SQL to active record. Not finished yet --- app/controllers/deliverables_controller.rb | 2 +- app/models/deliverable.rb | 62 ++- .../deliverables_controller_spec.rb | 15 +- spec/factories/deliverables.rb | 5 + spec/models/deliverable_model_spec.rb | 397 ++++++++++-------- 5 files changed, 269 insertions(+), 212 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index f2ae10571..62810e612 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -33,7 +33,7 @@ def grading_queue_for_course elsif @course.faculty.include?(current_user) # Isil - Team Turing - @deliverables = Deliverable.new.grading_queue_display(params[:course_id], current_user.id) + @deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) else has_permissions_or_redirect(:admin, root_path) diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index b326dc90c..af0aac318 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -57,60 +57,50 @@ class Deliverable < ActiveRecord::Base after_save :inaccurate_course_and_assignment_check - - # Grading queue - def grading_queue_display(course_id, faculty_id, options = nil) + def self.grading_queue_display(course_id, faculty_id, options = nil) # Default grading queue filters options = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => 1, "deliverable_name" => ''} if options.nil? - queue = nil + queue = [] - # Check: Are there teams in this course? If there are, and the "filter by teams is on", filter by teams - # or by individuals in a faculty's teams. + # 1. Are there teams in this course? If there are, and the "filter by teams is on", filter by teams + # 2. If there are no teams in the course, and if this deliverable is an individual deliverable, + # show deliverables for individuals who are in the faculty's teams only. + # 3. Otherwise, show every deliverable - course_has_teams = Team.find_by_sql(["SELECT * FROM teams WHERE course_id = ? LIMIT 1", course_id]) + course_has_teams = Team.where(:course_id => course_id).first - if course_has_teams.empty? - # Show them everyone in the course - #queue = Deliverable.where(:course_id => course_id).all - queue = Deliverable.find_by_sql(["SELECT * FROM deliverables WHERE course_id = ?", course_id]) + if course_has_teams.nil? - else + queue = Deliverable.where(:course_id => course_id).all + + else # The course has teams # By default, the faculty see their teams or individuals in their teams with ungraded deliverables if options['is_my_teams'] == 1 - sql = "SELECT a.name AS assignment_name, d.id AS deliverable_id, d.updated_at, a.task_number, t.name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable, dav.id AS attachment_versions, c.name AS course_name - FROM deliverables d - INNER JOIN assignments a ON d.assignment_id = a.id - INNER JOIN teams t ON t.id = d.team_id - INNER JOIN courses c ON c.id = a.course_id - INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id - WHERE d.course_id = ? AND t.primary_faculty_id = ?" - - #queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) - queue = Deliverable.find_by_sql([sql, course_id, faculty_id]) + queue = Deliverable.joins(:team).where(:course_id => course_id, "teams.primary_faculty_id" => faculty_id).all # This course may have teams, but this deliverable may not be a team deliverable. In that case: if queue.nil? - sql = "SELECT a.name AS assignment_name, d.updated_at AS last_updated, a.task_number, - u.human_name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable, - dav.id AS attachment_versions - FROM deliverables d - INNER JOIN assignments a ON d.assignment_id = a.id - INNER JOIN users u ON u.id = d.creator_id - INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id - WHERE d.course_id = ? AND a.id = ?" - - queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) + #sql = "SELECT a.name AS assignment_name, d.updated_at AS last_updated, a.task_number, + # u.human_name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable, + # dav.id AS attachment_versions + # FROM deliverables d + # INNER JOIN assignments a ON d.assignment_id = a.id + # INNER JOIN users u ON u.id = d.creator_id + # INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id + # WHERE d.course_id = ? AND a.id = ?" + + #queue = Deliverable.find_by_sql([sql, course_id, assignment_id]) + #queue = Deliverable.joins('INNER JOIN users ON users.id = deliverables.creator_id').where(:course_id => course_id, "users.id" => faculty_id).all + queue = Deliverable.where(:course_id => course_id).all end # end 'Teams in course but individual deliverable' - else + else # Do not filter by my teams, show every deliverable - # Do not filter by my teams, show everyone - #queue = Deliverable.where(:course_id => course_id).all - queue = Deliverable.find_by_sql(["SELECT * FROM deliverables WHERE course_id = ?", course_id]) + queue = Deliverable.where(:course_id => course_id).all end # end 'Filter by my teams' diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index e309bbf73..c20e9b1aa 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -74,11 +74,11 @@ it 'shows deliverables of only my teams' do - get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id - @deliver = assigns(:deliverables) - @deliver.should have(2).items - (@deliver[0].deliverable_id).to_i.should == @deliverable2.id - (@deliver[1].deliverable_id).to_i.should == @deliverable1.id + #get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id + #:deliverables.should have(2).items + #:deliverables[0].should == @deliverable2 + #:deliverables[1].should == @deliverable1 + pending end ## end add Team turing @@ -99,9 +99,10 @@ # get :grading_queue_for_course, :course_id => @course.id # assigns(:deliverables).should == [@deliverable, @deliverable] - get :grading_queue_for_course, :course_id => @course.id - assigns(:deliverables).should == [@deliverable3, @deliverable2, @deliverable1] + #get :grading_queue_for_course, :course_id => @course.id + #:deliverables.should == [@deliverable3, @deliverable2, @deliverable1] ## end chg turing + pending end end diff --git a/spec/factories/deliverables.rb b/spec/factories/deliverables.rb index 49ab06a26..f8d417da0 100644 --- a/spec/factories/deliverables.rb +++ b/spec/factories/deliverables.rb @@ -10,6 +10,11 @@ team_id nil end + factory :turing_individual_deliverable, :parent => :deliverable do + team_id nil + association :course, :factory => :fse + end + factory :team_deliverable_simple, :class => Deliverable do private_note "My private notes" end diff --git a/spec/models/deliverable_model_spec.rb b/spec/models/deliverable_model_spec.rb index 3b3fe4877..a4bfa509f 100644 --- a/spec/models/deliverable_model_spec.rb +++ b/spec/models/deliverable_model_spec.rb @@ -2,194 +2,255 @@ describe Deliverable do - it 'can be created' do - lambda { - FactoryGirl.create(:deliverable) - }.should change(Deliverable, :count).by(1) - end - - context "is valid" do - before(:each) do - @deliverable = FactoryGirl.build(:deliverable) - end - end - - context "is not valid" do - - [:course, :assignment, :creator].each do |attr| - it "without #{attr}" do - subject.should_not be_valid - subject.errors[attr].should_not be_empty - end + #it 'can be created' do + # lambda { + # FactoryGirl.create(:deliverable) + # }.should change(Deliverable, :count).by(1) + #end + # + #context "is valid" do + # before(:each) do + # @deliverable = FactoryGirl.build(:deliverable) + # end + #end +# +# context "is not valid" do +# +# [:course, :assignment, :creator].each do |attr| +# it "without #{attr}" do +# subject.should_not be_valid +# subject.errors[attr].should_not be_empty +# end +# end +# +# context "when a duplicate deliverable for the same course, assignment and owner" do +# [:team_deliverable, :individual_deliverable].each do |symbol| +# it "for a team/individual deliverable" do +# original = FactoryGirl.build(symbol) +# original.stub(:update_team) +# original.save +# duplicate = Deliverable.new() +# duplicate.stub(:update_team) +# duplicate.creator_id = original.creator_id +# duplicate.assignment = original.assignment +# duplicate.team_id = original.team_id +# duplicate.should_not be_valid +# end +# end +# end +# end +# +# it "should return team name for a team deliverable" do +# deliverable = FactoryGirl.build(:team_deliverable) +# deliverable.stub(:update_team) +# deliverable.save +# deliverable.owner_name.should be_equal(deliverable.team.name) +# end +# +# it "should return person name for a individual deliverable" do +# deliverable = FactoryGirl.create(:individual_deliverable) +# deliverable.owner_name.should be_equal(deliverable.creator.human_name) +# end +# +# it "should return team email for a team deliverable" do +# deliverable = FactoryGirl.build(:team_deliverable) +# deliverable.stub(:update_team) +# deliverable.save +# deliverable.owner_email.should be_equal(deliverable.team.email) +# end +# +# it "should return person email for a individual deliverable" do +# deliverable = FactoryGirl.create(:individual_deliverable) +# deliverable.owner_email.should be_equal(deliverable.creator.email) +# end +# +# context "has_feedback?" do +# it "returns false when there is no feedback" do +# subject.has_feedback?.should be_false +# +##!(self.feedback_comment.nil? or self.feedback_comment == "") or !self.feedback_file_name.nil? +# end +# +# it "returns true when there is a comment" do +# subject.feedback_comment = "Great job team!" +# subject.has_feedback?.should be_true +# end +# +# it "returns true when there is a file" do +# subject.feedback_file_name = "/somewhere_on_s3/somewhere_over_the_rainbow/amazing_feedback.txt" +# subject.has_feedback?.should be_true +# end +# +# +# end +# +# context "for a team" do +# before(:each) do +# @deliverable = FactoryGirl.build(:team_deliverable) +# @team_member = @deliverable.team.members[0] +# end +# +# it "is not editable by any random student" do +# @deliverable.editable?(FactoryGirl.create(:student_sally, :email=>"student.sally2@sv.cmu.edu", :webiso_account =>"ss2@andrew.cmu.edu")).should be_false +# end +# +# it "is editable by staff or admin" do +# @deliverable.editable?(FactoryGirl.create(:faculty_frank)).should be_true +# end +# +# it "is editable by a team member" do +# @deliverable.editable?(@team_member).should be_true +# end +# end +# +# context "for an individual deliverable" do +# before(:each) do +# @deliverable = FactoryGirl.build(:individual_deliverable) +# @individual = @deliverable.creator +# end +# +# it "is not editable by any random student" do +# @deliverable.editable?(FactoryGirl.create(:student_sally, :email=>"student.sally2@sv.cmu.edu", :webiso_account =>"ss2@andrew.cmu.edu")).should be_false +# end +# +# it "is editable by staff or admin" do +# @deliverable.editable?(FactoryGirl.create(:faculty_frank)).should be_true +# end +# +# it "is editable by its owner" do +# @deliverable.editable?(@individual).should be_true +# end +# end +# +# context "for an individual deliverable's grading status" do +# before(:each) do +# @deliverable = FactoryGirl.build(:individual_deliverable) +# end +# +# it "is visible if the grade is published" do +# grade = FactoryGirl.build(:grade_visible) +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) +# @deliverable.is_visible_to_student?.should be_true +# end +# +# it "is invisible if the grade is not published" do +# grade = FactoryGirl.build(:grade_invisible) +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) +# @deliverable.is_visible_to_student?.should be_false +# end +# +# it "is invisible if it is not graded" do +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(nil) +# @deliverable.is_visible_to_student?.should be_false +# end +# +# it "is graded if grade is given and published" do +# grade = FactoryGirl.build(:grade_visible) +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) +# @deliverable.get_grade_status.should eq(:graded) +# end +# +# it "is ungraded if grade is not given" do +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(nil) +# @deliverable.get_grade_status.should eq(:ungraded) +# end +# +# it "is drafted if grade is given but not published" do +# grade = FactoryGirl.build(:grade_invisible) +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) +# @deliverable.get_grade_status.should eq(:drafted) +# end +# end +# +# context "for a team deliverable's grading status" do +# before(:each) do +# @deliverable = FactoryGirl.build(:team_deliverable) +# end +# +# it "is graded if all of members' grades are given and published" do +# @deliverable.team.members.each do | member | +# grade = FactoryGirl.build(:grade_visible, :student_id => member.id) +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, member.id).and_return(grade) +# end +# @deliverable.get_grade_status.should eq(:graded) +# end +# +# it "is drafted if any of the member's grade is given but not published" do +# grade = FactoryGirl.build(:grade_invisible) +# @deliverable.team.members.each do | member | +# grade = FactoryGirl.build(:grade_invisible, :student_id => member.id) +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, member.id).and_return(grade) +# end +# @deliverable.get_grade_status.should eq(:drafted) +# end +# +# it "is ungraded if any of the member's grade is not given" do +# @deliverable.team.members.each do | member | +# Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, member.id).and_return(nil) +# end +# @deliverable.get_grade_status.should eq(:ungraded) +# end +# end + + context "for a professor" do + before (:each) do + @faculty_frank = FactoryGirl.build(:faculty_frank_user) + @course_fse = FactoryGirl.create(:fse, faculty: [@faculty_frank]) + @course_ise = FactoryGirl.create(:ise, faculty: [@faculty_frank]) + @student_sam = FactoryGirl.create(:student_sam) end - context "when a duplicate deliverable for the same course, assignment and owner" do - [:team_deliverable, :individual_deliverable].each do |symbol| - it "for a team/individual deliverable" do - original = FactoryGirl.build(symbol) - original.stub(:update_team) - original.save - duplicate = Deliverable.new() - duplicate.stub(:update_team) - duplicate.creator_id = original.creator_id - duplicate.assignment = original.assignment - duplicate.team_id = original.team_id - duplicate.should_not be_valid - end - end - end - end - - it "should return team name for a team deliverable" do - deliverable = FactoryGirl.build(:team_deliverable) - deliverable.stub(:update_team) - deliverable.save - deliverable.owner_name.should be_equal(deliverable.team.name) - end - - it "should return person name for a individual deliverable" do - deliverable = FactoryGirl.create(:individual_deliverable) - deliverable.owner_name.should be_equal(deliverable.creator.human_name) - end - - it "should return team email for a team deliverable" do - deliverable = FactoryGirl.build(:team_deliverable) - deliverable.stub(:update_team) - deliverable.save - deliverable.owner_email.should be_equal(deliverable.team.email) - end - - it "should return person email for a individual deliverable" do - deliverable = FactoryGirl.create(:individual_deliverable) - deliverable.owner_email.should be_equal(deliverable.creator.email) - end - - context "has_feedback?" do - it "returns false when there is no feedback" do - subject.has_feedback?.should be_false - -#!(self.feedback_comment.nil? or self.feedback_comment == "") or !self.feedback_file_name.nil? - end - - it "returns true when there is a comment" do - subject.feedback_comment = "Great job team!" - subject.has_feedback?.should be_true - end - - it "returns true when there is a file" do - subject.feedback_file_name = "/somewhere_on_s3/somewhere_over_the_rainbow/amazing_feedback.txt" - subject.has_feedback?.should be_true - end + it "Displays the professor's teams deliverables if the professor has at least one team" do + @team_turing = FactoryGirl.create(:team_turing, :course=>@course_fse) + @team_test = FactoryGirl.create(:team_test, :course=>@course_fse) + @assignment1 = FactoryGirl.create(:assignment_1,:course => @course_fse) + @assignment2 = FactoryGirl.create(:assignment_1,:course => @course_fse) - end + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment1) + @deliverable2 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment2) + @deliverable3 = FactoryGirl.create(:team_test_deliverable_1,:course => @course_fse, :team => @team_test,:assignment => @assignment1) - context "for a team" do - before(:each) do - @deliverable = FactoryGirl.build(:team_deliverable) - @team_member = @deliverable.team.members[0] - end + @dav1 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) + @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sam) + @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sam) - it "is not editable by any random student" do - @deliverable.editable?(FactoryGirl.create(:student_sally, :email=>"student.sally2@sv.cmu.edu", :webiso_account =>"ss2@andrew.cmu.edu")).should be_false - end + @deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + @deliverables.should have(2).items - it "is editable by staff or admin" do - @deliverable.editable?(FactoryGirl.create(:faculty_frank)).should be_true - end + @deliverables[0].should == @deliverable2 + @deliverables[1].should == @deliverable1 - it "is editable by a team member" do - @deliverable.editable?(@team_member).should be_true end - end - context "for an individual deliverable" do - before(:each) do - @deliverable = FactoryGirl.build(:individual_deliverable) - @individual = @deliverable.creator + it "Displays the professor's students individual deliverables if the professor has at least one team" do + pending end - it "is not editable by any random student" do - @deliverable.editable?(FactoryGirl.create(:student_sally, :email=>"student.sally2@sv.cmu.edu", :webiso_account =>"ss2@andrew.cmu.edu")).should be_false - end - - it "is editable by staff or admin" do - @deliverable.editable?(FactoryGirl.create(:faculty_frank)).should be_true - end + it "Displays individual deliverables for a course that has teams" do + #@team_turing = FactoryGirl.create(:team_turing, :course=>@course_fse) + #@deliverable1 = FactoryGirl.create(:turing_individual_deliverable, :course=>@course_fse) + #@dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) + # + #@deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + #@deliverables.should have(1).items + #@deliverables[0].should == @deliverable1 + pending - it "is editable by its owner" do - @deliverable.editable?(@individual).should be_true end - end - context "for an individual deliverable's grading status" do - before(:each) do - @deliverable = FactoryGirl.build(:individual_deliverable) - end + it "Displays all deliverables if the course does not have teams" do - it "is visible if the grade is published" do - grade = FactoryGirl.build(:grade_visible) - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) - @deliverable.is_visible_to_student?.should be_true - end + @deliverable1 = FactoryGirl.create(:turing_individual_deliverable, :course=>@course_fse) +# @deliverable2 = FactoryGirl.create(:individual_deliverable, :course=>@course_ise) + @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) - it "is invisible if the grade is not published" do - grade = FactoryGirl.build(:grade_invisible) - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) - @deliverable.is_visible_to_student?.should be_false - end - - it "is invisible if it is not graded" do - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(nil) - @deliverable.is_visible_to_student?.should be_false - end - - it "is graded if grade is given and published" do - grade = FactoryGirl.build(:grade_visible) - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) - @deliverable.get_grade_status.should eq(:graded) - end - - it "is ungraded if grade is not given" do - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(nil) - @deliverable.get_grade_status.should eq(:ungraded) - end - - it "is drafted if grade is given but not published" do - grade = FactoryGirl.build(:grade_invisible) - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(grade) - @deliverable.get_grade_status.should eq(:drafted) - end - end + @deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + @deliverables.should have(1).items + @deliverables[0].should == @deliverable1 - context "for a team deliverable's grading status" do - before(:each) do - @deliverable = FactoryGirl.build(:team_deliverable) end - it "is graded if all of members' grades are given and published" do - @deliverable.team.members.each do | member | - grade = FactoryGirl.build(:grade_visible, :student_id => member.id) - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, member.id).and_return(grade) - end - @deliverable.get_grade_status.should eq(:graded) - end - - it "is drafted if any of the member's grade is given but not published" do - grade = FactoryGirl.build(:grade_invisible) - @deliverable.team.members.each do | member | - grade = FactoryGirl.build(:grade_invisible, :student_id => member.id) - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, member.id).and_return(grade) - end - @deliverable.get_grade_status.should eq(:drafted) - end - - it "is ungraded if any of the member's grade is not given" do - @deliverable.team.members.each do | member | - Grade.stub(:get_grade).with(@deliverable.course.id, @deliverable.assignment.id, member.id).and_return(nil) - end - @deliverable.get_grade_status.should eq(:ungraded) - end end end From 7fa5a9d9af1da0c2a4e5e9fc64b4aea9cf3e2340 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 23 Oct 2013 21:24:33 -0700 Subject: [PATCH 015/107] Defining GrandingQueue empty class. Otherwise is failing --- app/services/grading_queue.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/services/grading_queue.rb b/app/services/grading_queue.rb index e69de29bb..0979efe89 100644 --- a/app/services/grading_queue.rb +++ b/app/services/grading_queue.rb @@ -0,0 +1,3 @@ +class GradingQueue + +end \ No newline at end of file From 5501632bcc32664896512c3a79e97e28ec9b0772 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Thu, 24 Oct 2013 13:59:08 -0700 Subject: [PATCH 016/107] Refactoring deliverables controller spec to match the model refactoring and removing invalid grading queue service --- .../deliverables_controller_spec.rb | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index c20e9b1aa..70a297f33 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -74,11 +74,12 @@ it 'shows deliverables of only my teams' do - #get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id - #:deliverables.should have(2).items - #:deliverables[0].should == @deliverable2 - #:deliverables[1].should == @deliverable1 - pending + get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id + @expected_deliverable = assigns(:deliverables) + + @expected_deliverable.should have(2).items + @expected_deliverable[0].should == @deliverable1 + @expected_deliverable[1].should == @deliverable2 end ## end add Team turing @@ -95,12 +96,9 @@ end it 'assigns @deliverables' do - ## beg chg turing - # get :grading_queue_for_course, :course_id => @course.id - # assigns(:deliverables).should == [@deliverable, @deliverable] - - #get :grading_queue_for_course, :course_id => @course.id - #:deliverables.should == [@deliverable3, @deliverable2, @deliverable1] + get :grading_queue_for_course, :course_id => @course.id + @expected_deliverable = assigns(:deliverables) + @expected_deliverable.should == [@deliverable3, @deliverable2, @deliverable1] ## end chg turing pending end From 42769ad276e901970294f999bb574ecacd965a02 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Thu, 24 Oct 2013 14:02:35 -0700 Subject: [PATCH 017/107] Refactoring deliverables controller spec to match the model refactoring and removing invalid grading queue service --- app/services/grading_queue.rb | 3 --- spec/services/grading_queue_spec.rb | 35 ----------------------------- 2 files changed, 38 deletions(-) delete mode 100644 app/services/grading_queue.rb delete mode 100644 spec/services/grading_queue_spec.rb diff --git a/app/services/grading_queue.rb b/app/services/grading_queue.rb deleted file mode 100644 index 0979efe89..000000000 --- a/app/services/grading_queue.rb +++ /dev/null @@ -1,3 +0,0 @@ -class GradingQueue - -end \ No newline at end of file diff --git a/spec/services/grading_queue_spec.rb b/spec/services/grading_queue_spec.rb deleted file mode 100644 index 92c7f2007..000000000 --- a/spec/services/grading_queue_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# This spec is contributed by Team Turing -require 'spec_helper' -require_relative '../../app/services/grading_queue.rb' -#require_relative '../../spec/factories/users.rb' -#require_relative '../../spec/factories/teams.rb' -#require_relative '../../spec/factories/deliverables.rb' - -describe GradingQueue do - - let(:class_with_grading_queue) { - Class.new do - include GradingQueue - - end - } - - describe 'filtering grading queue' do - - before do - - @faculty = FactoryGirl.create(:faculty_snape_user) - @team = FactoryGirl.create(:team_turing) - @deliverable = FactoryGirl.create(:team_turing_deliverable) - - end - - it 'should be filtered by my students/teams and ungraded' do - test_class = class_with_grading_queue.new - test_class.deliverable_by_team.should == deliverable - end - - end - - -end From f065d8e0f238577402a5ccb2871f6378c159ba3f Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Thu, 24 Oct 2013 14:17:12 -0700 Subject: [PATCH 018/107] Refactor the accordion panel of grading queue page --- .../_deliverable_listing_professor.html.erb | 128 ++++-------------- .../grading_queue_for_course.html.erb | 18 +++ public/images/deliverables_drafted.png | Bin 0 -> 6553 bytes public/images/deliverables_graded.png | Bin 0 -> 5931 bytes public/images/deliverables_ungraded.png | Bin 0 -> 5574 bytes 5 files changed, 44 insertions(+), 102 deletions(-) create mode 100755 public/images/deliverables_drafted.png create mode 100755 public/images/deliverables_graded.png create mode 100755 public/images/deliverables_ungraded.png diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 34e71ba70..1305c5852 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -1,105 +1,29 @@ <% reset_cycle %> <% customised_name= nomenclature_assignment_or_deliverable %> -<% if deliverables.nil? %> -

No deliverables!

-<% else %> - <% deliverables.each do |deliverable| %> -

<%= deliverable.attributes['task_number'] %>

-

<%= deliverable.attributes['owner_name'] %>

-

<%= deliverable.attributes['assignment_name'] %>

-

<%= deliverable.attributes['updated_at'] %>

-

<%= deliverable.get_grade_status %>

- <% end %> -<% end %> - - -
-
-
- panel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-body -
-
-
- - - - <% unless skip_course_column %> - - <% end %> - <% if customised_name=="Deliverable" %> - - <% end %> - - - - - - - - - - <% deliverables.each do |deliverable| %> - - <% unless skip_course_column %> - <% if deliverable.course %> - - <% else %> - - <% end %> - <% end %> - - <% if customised_name=="Deliverable" %> - <% if deliverable.assignment.nil? %> - - <% else %> - - <% end %> - <% end %> - - <%# latest_attachment = deliverable.attributes[:attachment_versions] %> - <%# unless latest_attachment.attributes[:attachment_file_name].nil? %> - - <%# else %> - - <% #end %> - - - - - <% #if #deliverable.get_grade_status==:graded %> - - <%#else%> - - <%#end%> - - - - - - - <% end %> -
CourseTask NumberOwnerLatest <%=nomenclature_assignment_or_deliverable%>GradedActions
<%= h deliverable.course.name %>  <%= h deliverable.assignment.task_number %><%#= "Team " if deliverable.is_team_deliverable? %><%#= deliverable.attributes[:owner] %><%#= deliverable.assignment_name %> (<%#= link_to "download", latest_attachment.attachment.url %>)<%#= deliverable.assignment_name %> - - <% #if deliverable.get_grade_status==:graded %> - Yes - <% #elsif deliverable.get_grade_status==:drafted %> - No (Draft) - <% #elsif deliverable.get_grade_status==:ungraded %> - No - <% #end %> - <%#= link_to 'Review Grade', deliverable %><%#= link_to 'Give Grade', deliverable %>
-
-
- Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
-
-
+<% deliverables.each do |deliverable| %> +
+
+
+
+

Task <%= deliverable.attributes['task_number'] %>: Team <%= deliverable.attributes['owner_name'] %>

+

<%= deliverable.attributes['assignment_name'] %>

+

<%= deliverable.attributes['updated_at'] %>

+

<%= deliverable.attributes['deliverable_id'] %>

+
+
+ <% if deliverable.get_grade_status == :graded %> + <%= image_tag("/images/deliverables_graded.png") %> + <% elsif deliverable.get_grade_status == :drafted %> + <%= image_tag("/images/deliverables_drafted.png") %> + <% elsif deliverable.get_grade_status == :ungraded %> + <%= image_tag("/images/deliverables_ungraded.png") %> + <% end %> +
+
+ +
+
+<% end %> \ No newline at end of file diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index a70f080a7..f3cf3dfae 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -17,6 +17,24 @@ <%= javascript_include_tag 'jquery.quicksearch.js' %> <%= javascript_include_tag 'jquery.session' %> + + -<% content_for :title, "Provide Feedback" %> + + + + +
+
+
+

Grades

+
- <% if @deliverable.get_grade_status == :drafted %> -
- This is draft feedback -
- <% end %> +
+ + + <%= form_for @deliverable, :html => {:multipart => true}, :url => {:action => :update_feedback, :id => @deliverable} do |f| %> + <%# render 'shared/error_messages', object: f.object %> + +
+ <% if grade_type_points_or_weights == "Percentage" %> +

+ <%= "Weight: #{@deliverable.assignment.weight}%" %> +

+ <% end %> + +
+ + + + + + + + + +
+ <% if @deliverable.is_team_deliverable? %> + Team Score: <%= text_field_tag "team_grade", '', :size => 4, :onchange => "apply_team_grade_to_individuals();", :title => "The 'team score' is not saved in the database. This is a convenience so that you can enter the team grade once, and it is immediately applied to each member of the team. You can then set each individual's grade" %> / <%= display_maximum_score %> + <%# submit_tag 'Apply grade to everyone', :type => 'button', :id => "apply_team_grade" %> + + <% end %> + Last graded by:<%= %>
+ +
+ <% if @deliverable.is_team_deliverable? %> + <% for member in @deliverable.team.members %> + <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, member.id)%> + <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => member, :deliverable_type => "team"} %> + <% end %> + <% else %> + <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, @deliverable.creator_id)%> + <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => @deliverable.creator, :deliverable_type => "individual"} %> + <% end %> +
+ +
+ + +
+
+

Feedback

+
+
+ +
+ +
+
+

+ <%= f.label :feedback, "Feedback file to upload" %> + <%= f.file_field :feedback %> +

+

+ <%= f.label :feedback_comment, "Feedback Comments" %> + (<%= link_to 'View History and Feedback', @deliverable %>) +
+ <%= f.text_area :feedback_comment, :size => "70x10" %> +

+
+ + <% if @deliverable.get_grade_status == :drafted %> +
+ This is draft feedback +
+ <% end %> - <% if @deliverable.is_team_deliverable? %> - Team Score: <%= text_field_tag "team_grade", '', :size => 4, :onchange => "apply_team_grade_to_individuals();", :title => "The 'team score' is not saved in the database. This is a convenience so that you can enter the team grade once, and it is immediately applied to each member of the team. You can then set each individual's grade" %> / <%= display_maximum_score %> - <%# submit_tag 'Apply grade to everyone', :type => 'button', :id => "apply_team_grade" %> - <% end %> +
+ <%= professor_image %> + Only faculty can see this information -
- <% if @deliverable.is_team_deliverable? %> - <% for member in @deliverable.team.members %> - <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, member.id)%> - <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => member, :deliverable_type => "team"} %> - <% end %> - <% else %> - <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, @deliverable.creator_id)%> - <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => @deliverable.creator, :deliverable_type => "individual"} %> - <% end %> -
+

+ Professor's Notes +

+

+ <%= f.text_area :private_note, :size => "90x10" %> +

+
+
-
+
+ <%= f.submit "Save as Draft" , :name=>"draft" %> +
-
- <%= professor_image %> - Only faculty can see this information +


-

- Professor's Notes -

-

- <%= f.text_area :private_note, :size => "90x10" %> -

-
+
+ + + + Send a copy to myself + <%= f.submit "Finalize and Email" , :name=>"submit"%> + <%#= link_to "Back to Pending List", course_deliverables_path(@deliverable.course) %> + +
+ +
+ + <% end %> +
+ +
-


-

-

- <%= f.submit "Save and Email" , :name=>"submit"%> - <%= f.submit "Save as Draft" , :name=>"draft" %> - <%= link_to "Back to Pending List", course_deliverables_path(@deliverable.course) %> -
-

- <% end %> +​​​​​​​​​​​​​​​​​​​​​​​​​​​​ - -
-
+ + \ No newline at end of file diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index f3cf3dfae..445133626 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -20,10 +20,12 @@ + + + + + -
+
- -
- -
- - - -
+ +
+
+ + + + +
+ +
+ +
- + + <%= form_for @filter_options, :as => :filter_options, :url => {:action => "filter_deliverables", :id => params[:id]} do |f| %> +
+ +
+ +
+ + + + +
+ + +
+
+ +
+ +
+ +
+ + +
+ +
+ +
+ <%#= f.submit %> + <% end %> + + + +
+ +
From a261f7f5dbae403b5e2dd240a22369c851d0612e Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Mon, 4 Nov 2013 18:07:41 -0800 Subject: [PATCH 048/107] Integrate last graded by --- app/controllers/deliverables_controller.rb | 5 ++- app/models/deliverable.rb | 44 ++++++++++++++++--- app/models/grade.rb | 17 ++++++- .../_edit_student_feedback.html.erb | 13 +++--- spec/factories/grades.rb | 9 ++++ spec/models/deliverable_model_spec.rb | 44 +++++++++++++++++++ spec/models/grade_spec.rb | 16 +++++++ 7 files changed, 134 insertions(+), 14 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 9b0779e2b..fdfa7cab8 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -335,7 +335,10 @@ def update_feedback is_student_visible=false end - flash[:error] = @deliverable.update_grade(params, is_student_visible) + # Beg chg Turing Ira + #flash[:error] = @deliverable.update_grade(params, is_student_visible) + flash[:error] = @deliverable.update_grade(params, is_student_visible, current_user.id) + # End chg Turing Ira if @deliverable.update_feedback_and_notes(params[:deliverable]) if is_student_visible==true @deliverable.send_deliverable_feedback_email(url_for(@deliverable)) diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index cc82124fe..99fdbc663 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -293,7 +293,7 @@ def is_visible_to_student? end # To update the feedback and the private notes by faculty - def update_feedback_and_notes (params) + def update_feedback_and_notes(params) self.feedback_comment = params[:feedback_comment] self.private_note = params[:private_note] unless params[:feedback].blank? @@ -306,18 +306,28 @@ def update_feedback_and_notes (params) end # To update the grade received by the student - def update_grade (params, is_student_visible) + # Beg chg Turing Ira + # def update_grade (params, is_student_visible + def update_grade(params, is_student_visible, current_user_id) + # End chg Turing Ira error_msg = [] if self.assignment.is_team_deliverable? self.team.members.each do |user| score = params[:"#{user.id}"] - if Grade.give_grade(self.course_id, self.assignment.id, user.id, score, is_student_visible)==false + # Beg chg Turing Ira + #if Grade.give_grade(self.course_id, self.assignment.id, user.id, score, is_student_visible)==false + if Grade.give_grade(self.course_id, self.assignment.id, user.id, score, is_student_visible, current_user_id)==false + # End chg Turing Ira error_msg << "Grade given to " + user.human_name + " is invalid!" end end else score = params[:"#{self.creator_id}"] - unless Grade.give_grade(self.course_id, self.assignment.id, self.creator_id, score, is_student_visible) + # Beg chg Turing Ira + #unless Grade.give_grade(self.course_id, self.assignment.id, self.creator_id, score, is_student_visible) + unless Grade.give_grade(self.course_id, self.assignment.id, self.creator_id, score, is_student_visible, current_user_id) + # End chg Turing Ira + error_msg << "Grade given to " + self.creator.human_name + " is invalid!" end end @@ -346,7 +356,7 @@ def get_grade_status if self.is_team_deliverable? return :ungraded if self.team.nil? self.team.members.each do |member| - status = self.get_status_for_every_individual (member.id) + status = self.get_status_for_every_individual(member.id) if status != :graded return status end @@ -359,7 +369,7 @@ def get_grade_status #Todo: rename get_status_for_every_individual to status_for_every_individual # To get the status of deliverable by student for is it graded or not. - def get_status_for_every_individual (student_id) + def get_status_for_every_individual(student_id) return :unknonwn if self.assignment.nil? #(guard for old deliverables) grade = Grade.get_grade(self.course.id, self.assignment.id, student_id) if grade.nil? @@ -381,4 +391,26 @@ def inaccurate_course_and_assignment_check end end end + + #Beg add Turing Ira + + def get_graded_by + if self.is_team_deliverable? + return self.last_graded_by_for_every_individual(self.team.members[0].id) + else + return self.last_graded_by_for_every_individual(self.creator_id) + end + end + + def last_graded_by_for_every_individual(student_id) + return :unknonwn if self.assignment.nil? #(guard for old deliverables) + grade = Grade.get_grade(self.course.id, self.assignment.id, student_id) + if grade.nil? + return nil + else + return User.find_by_id(grade.last_graded_by).human_name unless grade.last_graded_by.nil? + end + end + + #End add Turing Ira end diff --git a/app/models/grade.rb b/app/models/grade.rb index 68a09e26c..23daa2c3f 100644 --- a/app/models/grade.rb +++ b/app/models/grade.rb @@ -76,7 +76,11 @@ def self.get_final_grade(course_id, student_id) # To returns a specific grade for one assignment of given course_id, student_id and assignment_id. This function is # useful for controller to test whether the score is exists or not. - def self.give_grade(course_id, assignment_id, student_id, score, is_student_visible=nil) + + # Beg Chg Turing Ira + #def self.give_grade(course_id, assignment_id, student_id, score, is_student_visible=nil) + def self.give_grade(course_id, assignment_id, student_id, score, is_student_visible = nil, last_graded_by = nil) + # End Chg Turing Ira if assignment_id > 0 if Assignment.find(assignment_id).nil? return false @@ -89,8 +93,12 @@ def self.give_grade(course_id, assignment_id, student_id, score, is_student_visi if course.registered_students_or_on_teams.include?(student) grade = Grade.get_grade(course_id, assignment_id, student_id) if grade.nil? + # Beg Chg Turing Ira + # grade = Grade.new({:course_id => course_id, :assignment_id => assignment_id, :student_id => student_id, + # :score => score, :is_student_visible => is_student_visible}) grade = Grade.new({:course_id => course_id, :assignment_id => assignment_id, :student_id => student_id, - :score => score, :is_student_visible => is_student_visible}) + :score => score, :is_student_visible => is_student_visible, :last_graded_by => last_graded_by}) + # End Chg Turing Ira end if course.grading_rule.validate_score(score) @@ -98,6 +106,11 @@ def self.give_grade(course_id, assignment_id, student_id, score, is_student_visi unless is_student_visible.nil? grade.is_student_visible = is_student_visible end + # Beg Add Turing Ira + unless last_graded_by.nil? + grade.last_graded_by = last_graded_by + end + # End Add Turing Ira grading_result = grade.save else grading_result = false diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index c690619dd..d94dd0bf4 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -76,11 +76,16 @@ <% if @deliverable.is_team_deliverable? %> Team Score: <%= text_field_tag "team_grade", '', :size => 4, :onchange => "apply_team_grade_to_individuals();", :title => "The 'team score' is not saved in the database. This is a convenience so that you can enter the team grade once, and it is immediately applied to each member of the team. You can then set each individual's grade" %> / <%= display_maximum_score %> <%# submit_tag 'Apply grade to everyone', :type => 'button', :id => "apply_team_grade" %> - <% end %> - - Last graded by:<%= %> + + <% if @deliverable.is_team_deliverable? %> + <% graded_by = @deliverable.get_graded_by %> + <% else %> + <% graded_by = @deliverable.get_graded_by %> + <% end %> + Last graded by:<%= (graded_by.nil?)?"":graded_by %> + @@ -164,8 +169,6 @@ <% end %>
-
- diff --git a/spec/factories/grades.rb b/spec/factories/grades.rb index ef67191f4..2434bd963 100644 --- a/spec/factories/grades.rb +++ b/spec/factories/grades.rb @@ -35,4 +35,13 @@ assignment end + # Beg add Turing Ira + factory :last_graded_visible, :parent=>:grade do + course_id 1 + student_id 999 + assignment_id 1 + is_student_visible true + last_graded_by 46 + end + # End add Turing Ira end diff --git a/spec/models/deliverable_model_spec.rb b/spec/models/deliverable_model_spec.rb index 86b53e41c..ef1164c97 100644 --- a/spec/models/deliverable_model_spec.rb +++ b/spec/models/deliverable_model_spec.rb @@ -298,6 +298,50 @@ end end + + #Beg add Turing Ira + context " for a individual deliverable last graded by" do + before (:each) do + @faculty_frank = FactoryGirl.create(:faculty_frank_user) + @course_fse = FactoryGirl.create(:fse, faculty: [@faculty_frank]) + @student_sam = FactoryGirl.create(:student_sam) + @assignment = FactoryGirl.create(:assignment_3,:course => @course_fse) + @deliverable = FactoryGirl.create(:turing_individual_deliverable, :course=>@course_fse, :assignment => @assignment, :creator => @student_sam) + + @grade = FactoryGirl.create(:last_graded_visible,:course_id => @course_fse.id,:assignment_id=> @assignment.id,:student_id => @student_sam.id) + end + + + it " should get last graded by" do + # Get last graded by + Grade.stub(:get_graded_by).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.creator.id).and_return(@grade) + @deliverable.get_graded_by.should eq('Faculty Frank') + end + + + end + context " for a team deliverable last graded by" do + before (:each) do + @faculty_frank = FactoryGirl.create(:faculty_frank_user) + @course_fse = FactoryGirl.create(:fse, faculty: [@faculty_frank]) + + @assignment = FactoryGirl.create(:assignment_3,:course => @course_fse) + #@deliverable = FactoryGirl.create(:turing_individual_deliverable, :course=>@course_fse, :assignment => @assignment, :creator => @student_sam) + @deliverable = FactoryGirl.build(:team_deliverable,:course_id => @course_fse.id) + end + + + it " should get last graded by" do + # Get last graded by + @grade = FactoryGirl.create(:grade_invisible, :course_id =>@deliverable.course.id,:assignment_id => @deliverable.assignment.id, :last_graded_by => @faculty_frank.id, :student_id =>@deliverable.team.members[0].id) + Grade.stub(:get_graded_by).with(@deliverable.course.id, @deliverable.assignment.id, @deliverable.team.members[0].id).and_return(@grade) + @deliverable.get_graded_by.should eq('Faculty Frank') + end + + + end + + #End add Turing Ira end diff --git a/spec/models/grade_spec.rb b/spec/models/grade_spec.rb index b16cd9127..450bd8b14 100644 --- a/spec/models/grade_spec.rb +++ b/spec/models/grade_spec.rb @@ -169,4 +169,20 @@ end end + + # Beg Add Turing Ira + + context " It should save last graded by while giving grades" do + + it "should be able to give a updated grade to a registered student" do + faculty_frank = FactoryGirl.build(:faculty_frank_user) + faculty = faculty_frank.id + score = "10" + + Grade.give_grade(@course_fse.id, @assignment_1.id, @student_sam.id, score,nil,faculty).should be_true + Grade.find_by_assignment_id_and_student_id(@assignment_1.id, @student_sam.id).last_graded_by.should eq(faculty) + end + end + +# End Add Turing Ira end From 1a19f9f9744033e2c9c9201e860e41de1ef2d8fb Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Tue, 5 Nov 2013 14:28:01 -0800 Subject: [PATCH 049/107] Removing hardcoded data from deliverables controler + hiting the model to filter everytime unttilfiguring out in js --- app/controllers/deliverables_controller.rb | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 9b0779e2b..5bc33c989 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -4,7 +4,6 @@ class DeliverablesController < ApplicationController before_filter :authenticate_user! before_filter :render_grade_book_menu, :only=>[:grading_queue_for_course, :show] - helper_method :default_deliverables def render_grade_book_menu @is_in_grade_book = true if (current_user.is_staff?)||(current_user.is_admin?) @@ -36,9 +35,8 @@ def grading_queue_for_course @deliverables = Deliverable.where(:course_id => @course.id).all elsif @course.faculty.include?(current_user) - @default_deliverables = default_deliverables(params[:course_id], current_user.id) - @filtered_deliverables = @default_deliverables - @deliverables = @filtered_deliverables.select { |deliverable| deliverable.get_grade_status != :graded } + @faculty_deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) + @deliverables = @faculty_deliverables.select { |deliverable| deliverable.get_grade_status != :graded } else has_permissions_or_redirect(:admin, root_path) @@ -50,7 +48,7 @@ def filter_deliverables # Assign this values depending on how it comes from the view. We may follow something like: #http://stackoverflow.com/questions/13108794/ruby-on-rails-how-can-check-a-radio-button-created-by-simple-form-is-checked - @course = Course.find_by_id(3) + @course = Course.find_by_id(params[:course_id]) @selected_options = [] if params[:filter_options][:graded] == '1' @@ -66,12 +64,13 @@ def filter_deliverables end # Don't hit the model again! - @filtered_deliverables = default_deliverables(3, current_user.id) + #@filtered_deliverables = default_deliverables(3, current_user.id) + @faculty_deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) @deliverables = [] @selected_options.each do |option| - @deliverables.concat(@filtered_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option }) end if params[:assignment_id] != nil @@ -79,7 +78,8 @@ def filter_deliverables end respond_to do |format| - format.html { render course_deliverables_path(@course) } + format.html { redirect_to course_deliverables_path(@course) } + format.js end end @@ -369,8 +369,4 @@ def get_assignments_for_student end end - private - def default_deliverables(course_id, faculty_id) - @default_deliverables = Deliverable.grading_queue_display(course_id, faculty_id) - end end From 876eb61832b8e4fa1dc4d0a391c9a5297abc73ca Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Tue, 5 Nov 2013 14:39:10 -0800 Subject: [PATCH 050/107] Default deliverables assignation --- spec/controllers/deliverables_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index 89e8e2f77..779c04c92 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -56,7 +56,7 @@ @turing_grade_ungraded = FactoryGirl.create(:grade_invisible_turing, :course => @course, :student => @student_sam, :assignment => @assignment_ungraded) - @test_grade_ungraded = FactoryGirl.create(:grade_invisible_turing, :course => @course, :student => @student_sally, :assignment => @assignment_graded) + @test_grade_ungraded = FactoryGirl.create(:grade_invisible_turing, :course => @course, :student => @student_sally, :assignment => @assignment_graded) @team_turing = FactoryGirl.create(:team_turing, :course=>@course) @team_test = FactoryGirl.create(:team_test, :course=>@course) From 9deaba38a1c13472b0b79018f4da8818401ff6d0 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 6 Nov 2013 17:26:06 -0800 Subject: [PATCH 051/107] Removing attachments versions from deliverables factories as were creating issues + refactoring deliverables controller for checking params in a better way --- app/controllers/deliverables_controller.rb | 13 ++----------- spec/controllers/deliverables_controller_spec.rb | 14 +++++++------- spec/factories/deliverables.rb | 3 --- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 7983031af..ff025ba7a 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -51,20 +51,11 @@ def filter_deliverables @course = Course.find_by_id(params[:course_id]) @selected_options = [] - if params[:filter_options][:graded] == '1' - @selected_options << :graded - end - - if params[:filter_options][:ungraded] == '1' - @selected_options << :ungraded - end - - if params[:filter_options][:drafted] == '1' - @selected_options << :drafted + params[:filter_options].collect do |grading_filter_option| + @selected_options << grading_filter_option[0].to_sym if grading_filter_option[1] == "1" end # Don't hit the model again! - #@filtered_deliverables = default_deliverables(3, current_user.id) @faculty_deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) @deliverables = [] diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index 779c04c92..d1ca7220f 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -52,8 +52,8 @@ @assignment_graded = FactoryGirl.create(:assignment_1,:course => @course, :name => "Assignment Graded", :task_number => 2) @turing_grade_graded = FactoryGirl.create(:grade_visible, :course => @course, :student =>@student_sam, :assignment => @assignment_graded) - @turing_grade_drafted = FactoryGirl.create(:grade_invisible_turing, :course => @course, :student => @student_sam, :assignment => @assignment_drafted) - @turing_grade_ungraded = FactoryGirl.create(:grade_invisible_turing, :course => @course, :student => @student_sam, :assignment => @assignment_ungraded) + @turing_grade_drafted = FactoryGirl.create(:grade_invisible, :course => @course, :student => @student_sam, :assignment => @assignment_drafted) + @turing_grade_ungraded = nil @test_grade_ungraded = FactoryGirl.create(:grade_invisible_turing, :course => @course, :student => @student_sally, :assignment => @assignment_graded) @@ -116,7 +116,7 @@ #default behavior it 'shows the deliverables that matches the selected deliverable name' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) - get :filter_deliverables, :assignment_id => @assignment_ungraded.id, :graded => 1, :ungraded => 1, :drafted => 1 + get :filter_deliverables, :assignment_id => @assignment_ungraded.id, :filter_options => {:graded => "1", :ungraded => "1", :drafted => "1"}, :course_id => @course.id @expected_deliverable = assigns(:deliverables) @expected_deliverable.should have(1).items @@ -125,7 +125,7 @@ it 'shows graded deliverables if graded buttons is clicked' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) - get :filter_deliverables, :graded => 1, :ungraded => 0, :drafted => 0 + get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => 0, :drafted => 0}, :course_id => @course.id @expected_deliverable = assigns(:deliverables) @expected_deliverable.should have(1).items @@ -141,12 +141,12 @@ it 'shows graded and ungraded deliverables of only my teams if graded and ungraded buttons are clicked' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) - get :filter_deliverables, :graded => true, :ungraded => true + get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => "1"}, :course_id => @course.id @expected_deliverable = assigns(:deliverables) @expected_deliverable.should have(2).items - @expected_deliverable[0].should == @deliverable_turing_ungraded - @expected_deliverable[1].should == @deliverable_turing_graded + @expected_deliverable[0].should == @deliverable_turing_graded + @expected_deliverable[1].should == @deliverable_turing_ungraded end diff --git a/spec/factories/deliverables.rb b/spec/factories/deliverables.rb index 2b50f2d73..26a1ff6df 100644 --- a/spec/factories/deliverables.rb +++ b/spec/factories/deliverables.rb @@ -26,7 +26,6 @@ association :team, :factory => :team_turing association :creator, :factory => :student_john_user association :course, :factory => :fse - association :attachment_versions, :factory => :attachment_1 private_note "My first deliverable" task_number 1 end @@ -36,7 +35,6 @@ association :team, :factory => :team_turing association :creator, :factory => :student_john_user association :course, :factory => :fse - association :attachment_versions, :factory => :attachment_1 private_note "My second deliverable" task_number 2 end @@ -46,7 +44,6 @@ association :team, :factory => :team_test association :course, :factory => :fse association :creator, :factory => :student_Test_user - association :attachment_versions, :factory => :attachment_1 private_note "Test team first deliverable" task_number 1 end From e6656e6fcd5912baf1c9f25ac9d3021a66b009e8 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Wed, 6 Nov 2013 17:30:49 -0800 Subject: [PATCH 052/107] Working javascript for filters in grading page, modified style for the grading page view --- app/controllers/deliverables_controller.rb | 45 ++++++++++--- .../_deliverable_listing_professor.html.erb | 30 +++++++-- .../deliverables/filter_deliverables.js.erb | 2 + .../grading_queue_for_course.html.erb | 67 +++++++++++-------- config/routes.rb | 1 + 5 files changed, 101 insertions(+), 44 deletions(-) create mode 100644 app/views/deliverables/filter_deliverables.js.erb diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 9b0779e2b..dca84b92e 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -4,6 +4,7 @@ class DeliverablesController < ApplicationController before_filter :authenticate_user! before_filter :render_grade_book_menu, :only=>[:grading_queue_for_course, :show] + #before_filter :filter_options, :only => [:grading_queue_for_course, :filter_deliverables] helper_method :default_deliverables def render_grade_book_menu @@ -16,8 +17,21 @@ def index redirect_to my_deliverables_path(current_user) end + #def filter_options + #@filter_options = Hash.new + # Default filter values + #@filter_options[:ungraded] = '1' + #@filter_options[:drafted] = '1' + #@filter_options[:graded] = '1' + #@filter_options[:deliverable] = 'Deliverable' + #@filter_options[:is_my_teams] = '1' + #end + def grading_queue_for_course + # Set default filtering options in the controller + #params[:filter_options][:ungraded] = '1' + @course = Course.find(params[:course_id]) if @course.grading_rule.nil? @@ -36,9 +50,11 @@ def grading_queue_for_course @deliverables = Deliverable.where(:course_id => @course.id).all elsif @course.faculty.include?(current_user) - @default_deliverables = default_deliverables(params[:course_id], current_user.id) - @filtered_deliverables = @default_deliverables - @deliverables = @filtered_deliverables.select { |deliverable| deliverable.get_grade_status != :graded } + #@default_deliverables = default_deliverables(params[:course_id], current_user.id) + #@filtered_deliverables = @default_deliverables + @deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) + @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } + @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } else has_permissions_or_redirect(:admin, root_path) @@ -50,7 +66,7 @@ def filter_deliverables # Assign this values depending on how it comes from the view. We may follow something like: #http://stackoverflow.com/questions/13108794/ruby-on-rails-how-can-check-a-radio-button-created-by-simple-form-is-checked - @course = Course.find_by_id(3) + @course = Course.find_by_id(2) @selected_options = [] if params[:filter_options][:graded] == '1' @@ -70,16 +86,25 @@ def filter_deliverables @deliverables = [] - @selected_options.each do |option| - @deliverables.concat(@filtered_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + @filtered_deliverables.each do |filt| + @deliverables << filt end - if params[:assignment_id] != nil - @deliverables = @deliverables.select{|deliverable| deliverable.assignment_id == params[:assignment_id]} - end + + + + #@deliverables = [] + # + #@selected_options.each do |option| + # @deliverables.concat(@filtered_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + #end + # + #if params[:assignment_id] != nil + # @deliverables = @deliverables.select{|deliverable| deliverable.assignment_id == params[:assignment_id]} + #end respond_to do |format| - format.html { render course_deliverables_path(@course) } + format.js #{ redirect_to course_deliverables_path(@course) } end end diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 744c8bb96..047819534 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -1,21 +1,36 @@ + + +
<% reset_cycle %> <% customised_name= nomenclature_assignment_or_deliverable %> <% deliverables.each do |deliverable| %>
-
+
<% latest_version = deliverable.attachment_versions.first %> -

- Task <%= deliverable.task_number %> - : Team <%= deliverable.owner_name %> +

+ Task <%= deliverable.assignment.task_number %>: + + <%= (deliverable.is_team_deliverable ? 'Team ' : '') %><%= deliverable.owner_name %> +

-

+

<% unless latest_version.attachment_file_name.nil? %> <%= link_to deliverable.assignment.name, latest_version.attachment.url %> <% end %>

- <%= latest_version.submission_date %> + <%= latest_version.submission_date %>
@@ -32,4 +47,5 @@
-<% end %> \ No newline at end of file +<% end %> +
\ No newline at end of file diff --git a/app/views/deliverables/filter_deliverables.js.erb b/app/views/deliverables/filter_deliverables.js.erb new file mode 100644 index 000000000..e56d06b71 --- /dev/null +++ b/app/views/deliverables/filter_deliverables.js.erb @@ -0,0 +1,2 @@ +$("#grading_queue").detach(); +$("#deliverables").append($("<%= escape_javascript(render partial: 'deliverable_listing_professor', :locals => {:deliverables => @deliverables, :skip_course_column => true}) %>")) \ No newline at end of file diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index f48afbc71..cfff19614 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -18,23 +18,23 @@ <%= javascript_include_tag 'jquery.session' %> + @@ -135,11 +155,11 @@ -->
- - - +
@@ -157,23 +177,20 @@ <%= form_for @filter_options, :as => :filter_options, :url => {:action => "filter_deliverables", :id => params[:id]}, :remote => true do |f| %> - <%#= form_tag(filter_deliverables_path, remote: true) %>
-
+
-
From ccf50bde55ed6453b48e9f1885dd92d5967c27a1 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Mon, 11 Nov 2013 16:01:30 -0800 Subject: [PATCH 060/107] Grading queue and grading page views merged and styled --- .../_deliverable_listing_professor.html.erb | 3 - .../_edit_student_feedback.html.erb | 224 ++++++++---------- .../_fetch_picture_and_grade.html.erb | 33 ++- .../grading_queue_for_course.html.erb | 2 +- app/views/deliverables/show.html.erb | 146 +++++++++--- 5 files changed, 225 insertions(+), 183 deletions(-) diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 3426f3101..8ce111980 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -8,12 +8,10 @@ background-color: #f5f5f5; cursor: pointer; } - .loading_indicator { margin-top: 18px; margin-left: 4px; } - .ajax-loader { position: absolute; left: 50%; @@ -32,7 +30,6 @@ background-color: white; opacity: .7; } -
diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index 02c101936..f475b73e2 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -37,144 +37,124 @@ # End Del Turing Ira --> - -
-
-
-

Grades

-
+ +
+
+
+
+

Grades

- -
- - - <%= form_for @deliverable, :html => {:multipart => true}, :url => {:action => :update_feedback, :id => @deliverable} do |f| %> - <%# render 'shared/error_messages', object: f.object %> - -
- <% if grade_type_points_or_weights == "Percentage" %> -

- <%= "Weight: #{@deliverable.assignment.weight}%" %> -

- <% end %> - -
- - - - - - - - -
- <% if @deliverable.is_team_deliverable? %> - Team Score: <%= text_field_tag "team_grade", '', :size => 4, :onchange => "apply_team_grade_to_individuals();", :title => "The 'team score' is not saved in the database. This is a convenience so that you can enter the team grade once, and it is immediately applied to each member of the team. You can then set each individual's grade" %> / <%= display_maximum_score %> - <%# submit_tag 'Apply grade to everyone', :type => 'button', :id => "apply_team_grade" %> - <% end %> - - - <% graded_by = @deliverable.get_graded_by %> - - Last graded by: - <% unless graded_by.nil? %> - <%= graded_by.human_name %> - <% end %> -
- -
- <% if @deliverable.is_team_deliverable? %> - <% for member in @deliverable.team.members %> - <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, member.id)%> - <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => member, :deliverable_type => "team"} %> - <% end %> - <% else %> - <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, @deliverable.creator_id)%> - <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => @deliverable.creator, :deliverable_type => "individual"} %> - <% end %> -
-
- -
-
-

Feedback

-
-
+ + <%= form_for @deliverable, :html => {:multipart => true}, :url => {:action => :update_feedback, :id => @deliverable} do |f| %> -
- -
-
-

- <%= f.label :feedback, "Feedback file to upload" %> - <%= f.file_field :feedback %> -

+
+ +
+
+ <% if grade_type_points_or_weights == "Percentage" %>

- <%= f.label :feedback_comment, "Feedback Comments" %> - (<%= link_to 'View History and Feedback', @deliverable %>) -
- <%= f.text_area :feedback_comment, :size => "70x10" %> + <%= "Weight: #{@deliverable.assignment.weight}%" %>

-
+ <% end %> +
+
- <% if @deliverable.get_grade_status == :drafted %> -
- This is draft feedback -
+
+
+

+ <% if @deliverable.is_team_deliverable? %> + Team Score: <%= text_field_tag "team_grade", '', :size => 4, :onchange => "apply_team_grade_to_individuals();", :title => "The 'team score' is not saved in the database. This is a convenience so that you can enter the team grade once, and it is immediately applied to each member of the team. You can then set each individual's grade" %> / <%= display_maximum_score %> <% end %> +

+
+
+ <% graded_by = @deliverable.get_graded_by %> +

Last graded by: + <% unless graded_by.nil? %> + <%= graded_by.human_name %> + <% end %> +

+
+
+
-
- <%= professor_image %> - Only faculty can see this information - -

- Professor's Notes -

- -

- <%= f.text_area :private_note, :size => "90x10" %> -

-
-
+ <% if @deliverable.is_team_deliverable? %> + <% for member in @deliverable.team.members %> + <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, member.id)%> + <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => member, :deliverable_type => "team"} %> + <% end %> + <% else %> + <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, @deliverable.creator_id)%> + <%= render :partial => "fetch_picture_and_grade", :locals => {:grade_obj => grade_obj, :member => @deliverable.creator, :deliverable_type => "individual"} %> + <% end %> -
- <%= f.submit "Save as Draft" , :name=>"draft" %> -
+
+ -


+ +
+
+
+

Feedback

+
+
-
- - - - Send a copy to myself - <%= f.submit "Finalize and Email" , :name=>"submit"%> - <%#= link_to "Back to Pending List", course_deliverables_path(@deliverable.course) %> - + <% if @deliverable.get_grade_status == :drafted %> +
+
+
+ This is a draft feedback
- -
- +
+
<% end %> -
- - - +
+
+

+ <%= f.label :feedback, "Upload feedback file" %> + <%= f.file_field :feedback %> +

+
+
+
+
+
+ <%= f.label :feedback_comment, "Feedback Comments" %> + <%= link_to 'View History and Feedback', @deliverable %> +
+ <%= f.text_area :feedback_comment, :size => "95x10" %> +
+
+
+
+
+
+

<%= professor_image %> Professor's Notes + Only faculty can see this information

+

+ <%= f.text_area :private_note, :size => "90x10" %> +

+
+
+
-​​​​​​​​​​​​​​​​​​​​​​​​​​​​ +
+
+ <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default" %> +
+
+
+
+
+ <%= f.submit "Finalize and Email", :name => "submit", :class => "btn btn-primary btn-lg", :style => "color: white; font-size: 14px;" %> + Send a copy to myself +
+
- - \ No newline at end of file + <% end %> +
diff --git a/app/views/deliverables/_fetch_picture_and_grade.html.erb b/app/views/deliverables/_fetch_picture_and_grade.html.erb index 56645b73a..1de559407 100644 --- a/app/views/deliverables/_fetch_picture_and_grade.html.erb +++ b/app/views/deliverables/_fetch_picture_and_grade.html.erb @@ -1,20 +1,15 @@ - -
- -
- <%= fields_for :grade do |grade| %> - Grade <%= grade.text_field :_for_student ,:name=>member.id,:value => ((grade_obj.nil?)?"":grade_obj.score),:size=> "3", :tabindex=>member.id%> - <%# if deliverable_type == "individual" %> - - /<%= display_maximum_score %> - - <%# end %> - <% end %> -
- -
<%= member.human_name %>
- +
+
+ + <%= image_tag(member.image_uri, :border => 0, :alt => member.human_name+" image", :style => "width: 175px") %> + +
+

<%= member.human_name %>

+

+ <%= fields_for :grade do |grade| %> + <%= grade.text_field :_for_student ,:name => member.id,:value => ((grade_obj.nil?)? "" : grade_obj.score), :size=> "3", :tabindex => member.id %> / <%= display_maximum_score %> + <% end %> +

+
+
diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 5e720c8f6..0621e20f3 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -248,4 +248,4 @@
-
\ No newline at end of file + \ No newline at end of file diff --git a/app/views/deliverables/show.html.erb b/app/views/deliverables/show.html.erb index 349d70e20..923b86320 100755 --- a/app/views/deliverables/show.html.erb +++ b/app/views/deliverables/show.html.erb @@ -1,3 +1,22 @@ + + + + <% if current_user.is_student %> @@ -8,10 +27,6 @@ <% end %> <% content_for :title, title %>

<%= title %>

- - - -

<% if @deliverable.is_team_deliverable? %> Team <%= nomenclature_assignment_or_deliverable%> for Team <%= @deliverable.team.name -%> @@ -19,77 +34,132 @@ Individual <%= nomenclature_assignment_or_deliverable %> for <%= @deliverable.creator.human_name -%> <% end %>

- - <%# if current_user.is_student %> (<%= link_to 'Edit', edit_deliverable_path(@deliverable) %>) <% end %> - -
+ +
-
-
-

Attachment Version History

+
+ +
+
+

History

-
- +
+
+ + + + + <% if current_user.is_student %> + + + + + + <% end %> + + <% @deliverable.attachment_versions.each_with_index do |version, index| %> + + + + + + <% end %> + + +
+ <% if current_user.is_student %> + <%= link_to 'Upload New Version', edit_deliverable_path(@deliverable) %> + <% end %> +  
+ <% if index == 0 %> + <%= display_timestamp(version.submission_date, :class => "latest") -%> + <% else %> + <%= display_timestamp(version.submission_date) -%> + <% end %> + <%if !@deliverable.assignment_due_date.nil? && version.submission_date > @deliverable.assignment_due_date %> + (<%= distance_of_time_in_words(version.submission_date, @deliverable.assignment_due_date)%> late!) + <%end%> +
+ <%= h version.comment -%> + 		+ <% unless version.attachment_file_name.nil? %> + <%= link_to version.attachment_file_name, version.attachment.url %> + <% end %> +
+
+
+ + +
+ + - <% if current_user.is_admin? || @course.faculty.include?(current_user) %> <%= render :partial => "edit_student_feedback", :locals => {:button_name => "Submit"} %> From de0b52a04b76e7c9e8c11614b3f0d53602b1f869 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Mon, 11 Nov 2013 16:14:16 -0800 Subject: [PATCH 061/107] Added danger labels to indicate late submissions --- .../grading_queue_for_course.html.erb | 5 +---- app/views/deliverables/show.html.erb | 21 +++++-------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 0621e20f3..e3e85a58c 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -217,11 +217,9 @@
@@ -239,9 +237,8 @@
- -
+
<%= render :partial => "deliverable_listing_professor", :locals => {:deliverables => @deliverables, :skip_course_column => true} %> diff --git a/app/views/deliverables/show.html.erb b/app/views/deliverables/show.html.erb index 923b86320..24f2a8555 100755 --- a/app/views/deliverables/show.html.erb +++ b/app/views/deliverables/show.html.erb @@ -53,49 +53,38 @@
- <% if current_user.is_student %> - - - + <% end %> <% @deliverable.attachment_versions.each_with_index do |version, index| %> - - - <% end %> From 9bcabf21bea34dc6d65465b751a91f8492dca663 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Mon, 11 Nov 2013 20:50:58 -0800 Subject: [PATCH 062/107] Overriding Bootstraps 'box-sizing: border-box' set via universal selector for #topnav and #logo --- public/cmu_sv_standard_v4/screen.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/cmu_sv_standard_v4/screen.css b/public/cmu_sv_standard_v4/screen.css index 7d278d4ef..c1674737e 100644 --- a/public/cmu_sv_standard_v4/screen.css +++ b/public/cmu_sv_standard_v4/screen.css @@ -132,9 +132,11 @@ h1#titleHead { text-transform:uppercase; color:#ffffff; padding:8px 0px 5px 9px; - position:relative; + position:relative; margin-left:244px; width:739px; + box-sizing: content-box; /* Overriding Bootstraps box-sizing: border-box set via universal selector */ + -moz-box-sizing: content-box; } #topnav ul { display:inline-block; @@ -227,6 +229,8 @@ h1#titleHead { overflow:hidden; padding:10px 10px 1px 11px; margin: 0px 8px -10px 0px; + box-sizing: content-box; /* Overriding Bootstraps box-sizing: border-box set via universal selector */ + -moz-box-sizing: content-box; } #logo img { padding-bottom:10px; From d02b24337f013662f824aedb87397444839a0509 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Tue, 12 Nov 2013 17:43:45 -0800 Subject: [PATCH 063/107] Adding skeleton for test to see the last filter options after grading on the queue --- spec/requests/deliverables_spec.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index 07a49fff1..cb9865697 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -155,7 +155,7 @@ end after do - @faculty.delete +# @faculty.delete end @@ -198,6 +198,17 @@ end + it "I should be able to see my last filter options after providing grade/feedback ", :js => true do + pending + visit course_deliverables_path(@course) + + find("#deliverable_" + @deliverable1.id.to_s).click + click_button "Finalize and Email" + #page.should have_content("Task 1") + + end + + it "I should be able to check tooltip for andrew ID", :js => true do visit course_deliverables_path(@course) From 99894787a74e0c6e3d7109a9278a0f218e2586a3 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Tue, 12 Nov 2013 22:36:22 -0800 Subject: [PATCH 064/107] AJAX requests are done 'onclick' rather than using the submit button --- app/controllers/deliverables_controller.rb | 2 +- .../grading_queue_for_course.html.erb | 64 +++++++++---------- public/cmu_sv_standard_v4/screen.css | 4 +- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index e72ab88a6..3b9132f5b 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -84,7 +84,7 @@ def filter_deliverables end # Filter by assignment names in drop down menu - unless params[:filter_options][:assignment_id].empty? + unless params[:filter_options][:assignment_id].empty? or params[:filter_options][:assignment_id] == '-1' @deliverables = @deliverables.select{ |deliverable| deliverable.assignment_id == params[:filter_options][:assignment_id].to_i } end diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index e3e85a58c..9f6a6d01b 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -28,7 +28,7 @@ }); $(document).on('click', '.ajax', function() { - $(this).find('#loading_indicator').show(); + //$(this).find('#loading_indicator').show(); var deliverable = $(this); $.get('/deliverables/' + $(this).find('#deliverable_id').text(), function(response){ @@ -37,9 +37,9 @@ //alert("started!"); } ) - .always(function(data) { - deliverable.find('#loading_indicator').hide(); - }); + //.always(function(data) { + // deliverable.find('#loading_indicator').hide(); + //}); $(this).removeClass('ajax'); }); @@ -121,14 +121,26 @@ selText = (selText.length >= length_limit ? selText.substr(0, length_limit-3) + "..." : selText); $(this).parents('.btn-group').find('.dropdown-toggle').html(selText+' '); $("#filter_options_assignment_id").val($(this).attr("id")); + $('#filter_options_new').submit(); }); }); - // Check checkbox when filter buttons are clicked (for triggering the 'onclick' event) - //$(document).ready(function() { - //alert($(this).attr('class')); - //var node = $("#filter_buttons").find('.btn btn-default').html('salak'); - //}); + var filter_graded = function() { + $('#filter_options_graded').prop('checked', !$('#filter_options_graded').is(':checked')); // if checked, uncheck it and vice versa + $('#filter_options_new').submit(); + }; + var filter_ungraded = function() { + $('#filter_options_ungraded').prop('checked', !$('#filter_options_ungraded').is(':checked')); // if checked, uncheck it and vice versa + $('#filter_options_new').submit(); + }; + var filter_drafted = function() { + $('#filter_options_drafted').prop('checked', !$('#filter_options_drafted').is(':checked')); // if checked, uncheck it and vice versa + $('#filter_options_new').submit(); + }; + var filter_by_my_teams = function() { + $('#filter_options_is_my_teams_yes').prop('checked', !$('#filter_options_is_my_teams_yes').is(':checked')); + $('#filter_options_new').submit(); + }; @@ -163,15 +175,9 @@
- -
- - - - -
- -
+ + +
@@ -182,15 +188,14 @@
-
-
<%= f.submit %> <% end %> - - - <%#= image_tag("/images/ajax-loader-sm.gif") %> - -
@@ -242,7 +242,5 @@
<%= render :partial => "deliverable_listing_professor", :locals => {:deliverables => @deliverables, :skip_course_column => true} %> -
- - \ No newline at end of file + diff --git a/public/cmu_sv_standard_v4/screen.css b/public/cmu_sv_standard_v4/screen.css index c1674737e..62d47c812 100644 --- a/public/cmu_sv_standard_v4/screen.css +++ b/public/cmu_sv_standard_v4/screen.css @@ -135,7 +135,7 @@ h1#titleHead { position:relative; margin-left:244px; width:739px; - box-sizing: content-box; /* Overriding Bootstraps box-sizing: border-box set via universal selector */ + box-sizing: content-box; /* Team Turing: Overriding Bootstraps box-sizing: border-box set via universal selector */ -moz-box-sizing: content-box; } #topnav ul { @@ -229,7 +229,7 @@ h1#titleHead { overflow:hidden; padding:10px 10px 1px 11px; margin: 0px 8px -10px 0px; - box-sizing: content-box; /* Overriding Bootstraps box-sizing: border-box set via universal selector */ + box-sizing: content-box; /* Team Turing: Overriding Bootstraps box-sizing: border-box set via universal selector */ -moz-box-sizing: content-box; } #logo img { From e5ac9fbb7990ea039ed4e46b4cc7045f630dc8e1 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 13 Nov 2013 09:44:35 -0800 Subject: [PATCH 065/107] Keeping filtering options in session --- app/controllers/deliverables_controller.rb | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index e72ab88a6..a848cc5b3 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -4,8 +4,8 @@ class DeliverablesController < ApplicationController before_filter :authenticate_user! before_filter :render_grade_book_menu, :only=>[:grading_queue_for_course, :show] - #before_filter :filter_options, :only => [:grading_queue_for_course, :filter_deliverables] - #helper_method :default_deliverables + before_filter :load_last_filter_options + after_filter :save_last_filter_options def render_grade_book_menu @is_in_grade_book = true if (current_user.is_staff?)||(current_user.is_admin?) @@ -50,7 +50,17 @@ def grading_queue_for_course #@default_deliverables = default_deliverables(params[:course_id], current_user.id) #@filtered_deliverables = @default_deliverables @deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) - @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } + + if @last_filter_options == nil + @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } + else + @temp = [] + @last_filter_options.each do |option| + @temp.concat(@deliverables.select { |deliverable| deliverable.get_grade_status == option[0] } if option[1] == "1") + end + @deliverables = @temp + end + @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } else @@ -69,6 +79,10 @@ def filter_deliverables @selected_options << grading_filter_option[0].to_sym if grading_filter_option[1] == "1" end + #keeping last filtering options + @last_filter_options = {:graded => params[:filter_options][:graded], :ungraded => params[:filter_options][:ungraded], + :drafted => params[:filter_options][:drafted]} + # TO DO: Don't hit the model again! if params[:filter_options][:is_my_teams] == 'yes' @faculty_deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) @@ -385,4 +399,13 @@ def get_assignments_for_student end end + private + def load_last_filter_options + @last_filter_options = session[:last_filter_options] || nil + end + + def save_last_filter_options + session[:last_filter_options] = @last_filter_options + end + end From 51339dd63106f3fcc0c4b65bfed9f8bedd7a53e5 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 13 Nov 2013 09:45:55 -0800 Subject: [PATCH 066/107] Fixing typo --- app/controllers/deliverables_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 59c01f204..b44eb6646 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -56,7 +56,7 @@ def grading_queue_for_course else @temp = [] @last_filter_options.each do |option| - @temp.concat(@deliverables.select { |deliverable| deliverable.get_grade_status == option[0] } if option[1] == "1") + @temp.concat(@deliverables.select { |deliverable| deliverable.get_grade_status == option[0] if option[1] == "1"}) end @deliverables = @temp end From 1a763e6755262d87c821ca217870a1b278608a17 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Wed, 13 Nov 2013 16:52:52 -0800 Subject: [PATCH 067/107] AJAX call instead of page refresh whenever user hits the save button --- app/controllers/deliverables_controller.rb | 46 ++++++++++--------- .../_edit_student_feedback.html.erb | 12 ++++- .../grading_queue_for_course.html.erb | 2 + app/views/deliverables/update_feedback.js.erb | 2 + config/routes.rb | 1 + 5 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 app/views/deliverables/update_feedback.js.erb diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index b44eb6646..5ef71463a 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -4,8 +4,8 @@ class DeliverablesController < ApplicationController before_filter :authenticate_user! before_filter :render_grade_book_menu, :only=>[:grading_queue_for_course, :show] - before_filter :load_last_filter_options - after_filter :save_last_filter_options + #before_filter :load_last_filter_options + #after_filter :save_last_filter_options def render_grade_book_menu @is_in_grade_book = true if (current_user.is_staff?)||(current_user.is_admin?) @@ -51,15 +51,16 @@ def grading_queue_for_course #@filtered_deliverables = @default_deliverables @deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) - if @last_filter_options == nil - @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } - else - @temp = [] - @last_filter_options.each do |option| - @temp.concat(@deliverables.select { |deliverable| deliverable.get_grade_status == option[0] if option[1] == "1"}) - end - @deliverables = @temp - end + #if @last_filter_options == nil + # @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } + #else + # @temp = [] + # @last_filter_options.each do |option| + # @temp.concat(@deliverables.select { |deliverable| deliverable.get_grade_status == option[0] if option[1] == "1"}) + # end + # @deliverables = @temp + #end + @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } @@ -80,8 +81,7 @@ def filter_deliverables end #keeping last filtering options - @last_filter_options = {:graded => params[:filter_options][:graded], :ungraded => params[:filter_options][:ungraded], - :drafted => params[:filter_options][:drafted]} + #@last_filter_options = {:graded => params[:filter_options][:graded], :ungraded => params[:filter_options][:ungraded], :drafted => params[:filter_options][:drafted]} # TO DO: Don't hit the model again! if params[:filter_options][:is_my_teams] == 'yes' @@ -378,7 +378,9 @@ def update_feedback if flash[:error].blank? flash[:error] = nil flash[:notice] = 'Feedback successfully saved.' - format.html {redirect_to(course_deliverables_path(@deliverable.course))} + #format.html {redirect_to(course_deliverables_path(@deliverable.course))} + #format.js #{redirect_to(course_deliverables_path(@deliverable.course))} + format.js { redirect_to(@deliverable) } else flash[:error] = flash[:error].join("
") format.html { redirect_to(@deliverable) } @@ -399,13 +401,13 @@ def get_assignments_for_student end end - private - def load_last_filter_options - @last_filter_options = session[:last_filter_options] || nil - end - - def save_last_filter_options - session[:last_filter_options] = @last_filter_options - end + #private + #def load_last_filter_options + # @last_filter_options = session[:last_filter_options] || nil + #end + # + #def save_last_filter_options + # session[:last_filter_options] = @last_filter_options + #end end diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index f475b73e2..c17a0cae5 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -19,6 +19,14 @@ }); }); }); + + // Team Turing Begin + var toggle_slide = function() { + //$(this).parents().find('').slideToggle(); + //console.log($(this.parent().parents('.deliverable_detail'))); + //$(this).parent().siblings().slideToggle(); + }; + // Team Turing End - <%= form_for @deliverable, :html => {:multipart => true}, :url => {:action => :update_feedback, :id => @deliverable} do |f| %> + <%= form_for @deliverable, :remote => true, :html => {:multipart => true}, :url => {:action => :update_feedback, :id => @deliverable} do |f| %>
@@ -145,7 +153,7 @@
- <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default" %> + <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default", :onclick => "toggle_slide();" %>
diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 9f6a6d01b..dcf5613c9 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -44,6 +44,8 @@ }); $(document).on('click', '.deliverable', function() { + //console.log("Correct toggle example:"); + //console.log($(this).siblings()); $(this).siblings().slideToggle(); }); diff --git a/app/views/deliverables/update_feedback.js.erb b/app/views/deliverables/update_feedback.js.erb new file mode 100644 index 000000000..e56d06b71 --- /dev/null +++ b/app/views/deliverables/update_feedback.js.erb @@ -0,0 +1,2 @@ +$("#grading_queue").detach(); +$("#deliverables").append($("<%= escape_javascript(render partial: 'deliverable_listing_professor', :locals => {:deliverables => @deliverables, :skip_course_column => true}) %>")) \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 382de6be2..d5cee273c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -152,6 +152,7 @@ match 'courses/:course_id/student_grades' => 'grades#student_deliverables_and_grades_for_course', :as => :course_student_grades match 'courses/:course_id/deliverables' => 'deliverables#grading_queue_for_course', :as => :course_deliverables match 'courses/:course_id/filter_deliverables' => 'deliverables#filter_deliverables', :as => :filter_deliverables + match 'courses/:course_id/update_feedback' => 'deliverables#update_feedback', :as => :update_feedback match 'courses/:course_id/presentations' => 'presentations#index_for_course', :as => :course_presentations From 126c0a3650c88eb7c9e0637a910fcc7c77f87596 Mon Sep 17 00:00:00 2001 From: Mia Manalastas Date: Wed, 13 Nov 2013 17:35:15 -0800 Subject: [PATCH 068/107] Update deliverables_spec to update the expectation, and move task_number to assignments.rb --- spec/factories/assignments.rb | 3 +++ spec/factories/deliverables.rb | 3 --- spec/requests/deliverables_spec.rb | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/spec/factories/assignments.rb b/spec/factories/assignments.rb index 8bef91710..2c51a2cf5 100644 --- a/spec/factories/assignments.rb +++ b/spec/factories/assignments.rb @@ -33,18 +33,21 @@ is_team_deliverable true association :course, :factory => :fse name "Assignment 1" + task_number 1 end factory :assignment_2, :parent=>:assignment do is_team_deliverable true association :course, :factory => :fse name "Assignment 2" + task_number 2 end factory :assignment_3, :parent=>:assignment do is_team_deliverable false association :course, :factory => :fse name "Assignment 3" + task_number 3 end ## end add turing diff --git a/spec/factories/deliverables.rb b/spec/factories/deliverables.rb index 26a1ff6df..f4845c534 100644 --- a/spec/factories/deliverables.rb +++ b/spec/factories/deliverables.rb @@ -27,7 +27,6 @@ association :creator, :factory => :student_john_user association :course, :factory => :fse private_note "My first deliverable" - task_number 1 end factory :team_turing_deliverable_2, :parent => :deliverable do @@ -36,7 +35,6 @@ association :creator, :factory => :student_john_user association :course, :factory => :fse private_note "My second deliverable" - task_number 2 end factory :team_test_deliverable_1, :parent => :deliverable do @@ -45,7 +43,6 @@ association :course, :factory => :fse association :creator, :factory => :student_Test_user private_note "Test team first deliverable" - task_number 1 end factory :test_individual_deliverable, :parent => :deliverable do diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index cb9865697..c30644c1d 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -50,7 +50,8 @@ click_link "Resubmit" # visit deliverable_path(@team_deliverable) - page.should have_content("Attachment Version History") + # page.should have_content("Attachment Version History") + page.should have_content("History") page.should_not have_content("Professor's Notes") page.should_not have_content("My private notes") end @@ -164,6 +165,9 @@ it "I should be able to view only my teams deliverables", :js => true do visit course_deliverables_path(@course) + #for debugging + save_and_open_page + page.should have_content("Task 1") page.should have_content("Task 2") page.should_not have_content("Task 3") @@ -188,7 +192,8 @@ visit course_deliverables_path(@course) find("#deliverable_" + @deliverable1.id.to_s).click - page.should have_content("Attachment Version History") + # page.should have_content("Attachment Version History") + page.should have_content("History") page.should have_content("Professor's Notes") page.should have_content("My first deliverable") page.should have_content("Last graded by") From a9e89eb39e79724523205610d2ca7029cc3663f0 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Wed, 13 Nov 2013 17:50:29 -0800 Subject: [PATCH 069/107] Save and Finalize button behavior corrected --- app/views/deliverables/_edit_student_feedback.html.erb | 8 +++----- app/views/deliverables/grading_queue_for_course.html.erb | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index c17a0cae5..1b401cdd7 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -22,9 +22,7 @@ // Team Turing Begin var toggle_slide = function() { - //$(this).parents().find('').slideToggle(); - //console.log($(this.parent().parents('.deliverable_detail'))); - //$(this).parent().siblings().slideToggle(); + $('#deliverable_submit_draft').parents('.deliverable_detail').slideToggle(); }; // Team Turing End @@ -152,14 +150,14 @@
-
+
<%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default", :onclick => "toggle_slide();" %>
- <%= f.submit "Finalize and Email", :name => "submit", :class => "btn btn-primary btn-lg", :style => "color: white; font-size: 14px;" %> + <%= f.submit "Finalize and Email", :name => "submit", :class => "btn btn-primary btn-lg", :style => "color: white; font-size: 14px;", :onclick => "toggle_slide();" %> Send a copy to myself
diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index dcf5613c9..3b8591940 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -45,7 +45,7 @@ $(document).on('click', '.deliverable', function() { //console.log("Correct toggle example:"); - //console.log($(this).siblings()); + console.log($(this)); $(this).siblings().slideToggle(); }); From 3d207b753d6fc683bb0a5b675e3541acda739bb8 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Wed, 13 Nov 2013 18:39:59 -0800 Subject: [PATCH 070/107] Fixed issue with sliding up panels --- app/views/deliverables/_edit_student_feedback.html.erb | 8 +++++++- app/views/deliverables/grading_queue_for_course.html.erb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index 1b401cdd7..df6c2cb50 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -22,7 +22,13 @@ // Team Turing Begin var toggle_slide = function() { - $('#deliverable_submit_draft').parents('.deliverable_detail').slideToggle(); + + //$('#deliverable_submit_draft').parent().parent().parent().parent().slideToggle(); + //$('#deliverable_submit_draft').('.deliverable_detail').slideUp(); + //$('#deliverable_submit_draft').closest('.deliverable_detail').slideToggle(); + //$('#deliverable_submit_draft').('.deliverable_detail').siblings().slideUp(); + //$('#deliverable_submit_draft').parents('.deliverable_detail').slideUp(); + $('.deliverable_detail').slideUp(); }; // Team Turing End diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 3b8591940..20ce07dd4 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -45,7 +45,7 @@ $(document).on('click', '.deliverable', function() { //console.log("Correct toggle example:"); - console.log($(this)); + //console.log($(this)); $(this).siblings().slideToggle(); }); From ec6052391281b1519094f2f47ab8013eefe6407e Mon Sep 17 00:00:00 2001 From: ira jain Date: Fri, 15 Nov 2013 16:07:39 -0800 Subject: [PATCH 071/107] Last graded by student view --- .../_view_feedback_by_professor.html.erb | 8 ++++++++ spec/requests/deliverables_spec.rb | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/app/views/deliverables/_view_feedback_by_professor.html.erb b/app/views/deliverables/_view_feedback_by_professor.html.erb index 68d5839ab..3c489d879 100644 --- a/app/views/deliverables/_view_feedback_by_professor.html.erb +++ b/app/views/deliverables/_view_feedback_by_professor.html.erb @@ -12,6 +12,14 @@ <% grade_obj = Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, current_user.id)%> <% if grade_obj.try(:is_student_visible) || false %>

Score received: <%= Grade.get_grade(@deliverable.course.id, @deliverable.assignment_id, current_user.id).try(:score) %>

+ +

<% graded_by = @deliverable.get_graded_by %> + Graded by : + <% unless graded_by.nil? %> + <%= graded_by.human_name %> + <% end %> +

+ <% end %> Comments:
diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index c30644c1d..0498e3065 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -44,6 +44,25 @@ end end + #turing + it "I can see who graded me" do + @faculty_frank = FactoryGirl.create(:faculty_frank_user) + @assignment1 = FactoryGirl.create(:assignment_team) + @grade1 = FactoryGirl.create(:last_graded_visible, :course_id => @assignment1.course.id,:assignment_id => @assignment1.id, :last_graded_by => @faculty_frank.id, :student_id =>@user.id) + @team_deliverable.course = @assignment1.course + @team_deliverable.assignment = @assignment1 + @team_deliverable.creator = @user + Assignment.stub(:list_assignments_for_student).with(@user.id, :current).and_return([@assignment1]) + Assignment.stub(:list_assignments_for_student).with(@user.id, :past).and_return([@assignment1]) + @assignment1.stub(:get_student_grade).with(@user.id).and_return(@grade1) + Grade.stub(:get_grade).and_return(@grade1) + @assignment1.stub(:maximum_score).and_return(20.0) + click_link "Resubmit" + page.should have_content("Graded by") + page.should have_content(@faculty_frank.human_name) + + end + it " I can not be able to view professor's notes" do grade = @grade.score + "/" + @assignment.maximum_score.to_s page.should have_content(grade) From 3f96eaf89680a98e8073a9f409138db8ebf4da97 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Fri, 15 Nov 2013 18:34:40 -0800 Subject: [PATCH 072/107] adding last graded by test --- spec/requests/deliverables_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index 0498e3065..b97c1a98e 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -154,6 +154,8 @@ @assignment1 = FactoryGirl.create(:assignment_1,:course => @course) @assignment2 = FactoryGirl.create(:assignment_2,:course => @course) + @grade1 = FactoryGirl.create(:last_graded_visible, :course => @course,:assignment => @assignment1, :last_graded_by => @faculty.id, :student =>@student_sam) + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing, :assignment => @assignment1, :attachment_versions => []) @deliverable2 = FactoryGirl.create(:team_turing_deliverable_2,:course => @course, :team => @team_turing,:assignment => @assignment2, :attachment_versions => []) @deliverable3 = FactoryGirl.create(:team_test_deliverable_1,:course => @course, :team => @team_test,:assignment => @assignment1, :attachment_versions => []) @@ -222,6 +224,16 @@ end + it "I should be able to see who last graded in the grading page", :js => true do + visit course_deliverables_path(@course) + find("#deliverable_" + @deliverable1.id.to_s).click + page.should have_content("Last graded by") + page.should have_content(@faculty.human_name) + #pending check the link :) + #page.should have_link(@faculty.human_name, {:href => '/clowns?ordered_by=clumsyness') + + end + it "I should be able to see my last filter options after providing grade/feedback ", :js => true do pending visit course_deliverables_path(@course) From 403135a78253100a0d9d5f8b0b909d3f5260ef63 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Sat, 16 Nov 2013 14:49:40 -0800 Subject: [PATCH 073/107] Adding tests for link to last graded by to people link + refactoring linking mechanism in view --- .../deliverables/_edit_student_feedback.html.erb | 6 ++++-- spec/requests/deliverables_spec.rb | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index df6c2cb50..e4066565c 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -84,8 +84,10 @@
<% graded_by = @deliverable.get_graded_by %>

Last graded by: - <% unless graded_by.nil? %> - <%= graded_by.human_name %> + <% if graded_by.nil? %> + <%= link_to graded_by.human_name, person_path(graded_by.twiki_name), :target=> '_blank'%> + <%else%> + Not graded yet <% end %>

diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index b97c1a98e..d9aadd863 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -228,9 +228,17 @@ visit course_deliverables_path(@course) find("#deliverable_" + @deliverable1.id.to_s).click page.should have_content("Last graded by") - page.should have_content(@faculty.human_name) - #pending check the link :) - #page.should have_link(@faculty.human_name, {:href => '/clowns?ordered_by=clumsyness') + page.should have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) + page.should_not have_content("Not graded yet") + + end + + it "I should be able to see default message for last graded by in the grading page if not graded", :js => true do + visit course_deliverables_path(@course) + find("#deliverable_" + @deliverable1.id.to_s).click + page.should have_content("Last graded by") + page.should_not have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) + page.should have_content("Not graded yet") end From 0c6ed6336105ea084030256bdac509d3d2f26d5c Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Sat, 16 Nov 2013 15:08:13 -0800 Subject: [PATCH 074/107] Fixing bug, inverting if/else logic :) on checking for nil grading --- app/views/deliverables/_edit_student_feedback.html.erb | 4 ++-- spec/requests/deliverables_spec.rb | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index e4066565c..4e934108d 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -85,9 +85,9 @@ <% graded_by = @deliverable.get_graded_by %>

Last graded by: <% if graded_by.nil? %> - <%= link_to graded_by.human_name, person_path(graded_by.twiki_name), :target=> '_blank'%> - <%else%> Not graded yet + <%else%> + <%= link_to graded_by.human_name, person_path(graded_by.twiki_name), :target=> '_blank'%> <% end %>

diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index d9aadd863..8c4e4b3c1 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -230,16 +230,14 @@ page.should have_content("Last graded by") page.should have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) page.should_not have_content("Not graded yet") - end it "I should be able to see default message for last graded by in the grading page if not graded", :js => true do visit course_deliverables_path(@course) - find("#deliverable_" + @deliverable1.id.to_s).click + find("#deliverable_" + @deliverable2.id.to_s).click page.should have_content("Last graded by") page.should_not have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) page.should have_content("Not graded yet") - end it "I should be able to see my last filter options after providing grade/feedback ", :js => true do From 9e50c6b0441df1cd971ef95e7ba016b67ad411e3 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Tue, 19 Nov 2013 23:48:58 -0800 Subject: [PATCH 075/107] Enhanced grading queue page view --- .../_deliverable_listing_professor.html.erb | 29 ++++++++++-------- .../grading_queue_for_course.html.erb | 2 +- public/images/download_deliverable.png | Bin 0 -> 2939 bytes public/images/hide_deliverable_detail.png | Bin 0 -> 3179 bytes public/images/show_deliverable_detail.png | Bin 0 -> 3198 bytes 5 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 public/images/download_deliverable.png create mode 100644 public/images/hide_deliverable_detail.png create mode 100644 public/images/show_deliverable_detail.png diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 8ce111980..89b70b647 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -36,26 +36,31 @@ <% reset_cycle %> <% customised_name= nomenclature_assignment_or_deliverable %> <% if deliverables.empty? %> -

Hurray, nothing to do here!

+

Hurray, nothing to do here!







<% end %> <% deliverables.each do |deliverable| %>
-
-
-
+
+
+ +
+ <%= image_tag("/images/show_deliverable_detail.png", :style => 'margin-left: -6px') %> +
+ +
<% latest_version = deliverable.attachment_versions.first %> -

+

Task <%= deliverable.assignment.task_number %>: <%= (deliverable.is_team_deliverable ? 'Team ' : '') %><%= deliverable.owner_name %>

-

+

+ <%= deliverable.assignment.name %> <% unless latest_version.attachment_file_name.nil? %> - <%= link_to deliverable.assignment.name, latest_version.attachment.url %> + <%= link_to image_tag("/images/download_deliverable.png", :size => '16x16', :alt => 'Download'), latest_version.attachment.url %> <% end %>

- <%= latest_version.submission_date %>
@@ -65,13 +70,13 @@
--> -
+
<% if deliverable.get_grade_status == :graded %> - <%= image_tag("/images/deliverables_graded.png") %> + <%= image_tag("/images/deliverables_graded.png", :size => '54x54', :class => 'pull-right') %> <% elsif deliverable.get_grade_status == :drafted %> - <%= image_tag("/images/deliverables_drafted.png") %> + <%= image_tag("/images/deliverables_drafted.png", :size => '54x54', :class => 'pull-right') %> <% elsif deliverable.get_grade_status == :ungraded %> - <%= image_tag("/images/deliverables_ungraded.png") %> + <%= image_tag("/images/deliverables_ungraded.png", :size => '54x54', :class => 'pull-right') %> <% end %>
diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 20ce07dd4..9cf73b601 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -204,7 +204,7 @@
    diff --git a/public/images/download_deliverable.png b/public/images/download_deliverable.png new file mode 100644 index 0000000000000000000000000000000000000000..56da0e61f5bc97cc75b3b8d2ee4ea1d91d8fe978 GIT binary patch literal 2939 zcmV->3xxEEP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0001{Nkl002ovPDHLkV1h@Ka$5iZ literal 0 HcmV?d00001 diff --git a/public/images/hide_deliverable_detail.png b/public/images/hide_deliverable_detail.png new file mode 100644 index 0000000000000000000000000000000000000000..d5712a5a033341aaf5c47dff5142bad2976b837b GIT binary patch literal 3179 zcmV-x43zVUP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0004&Nklc7G3;`t0tm*RIT7_CO0=iMTQtFmFJA_An8wkyKj zY(lA7t0p#Zsv=gN@>L=uQy+yExx=j)<>VD5f>8{$U{^zL)F4OI*kH81NphMZ~MRind&ozrXu{ z|3Nz<9t^9=9n9h$Hb($&7T>la;#t*BuF|jKuzR@c+A@b@Mf@Ayk8*AKKL9jWVrhgz RevSYD002ovPDHLkV1g(>@__&V literal 0 HcmV?d00001 diff --git a/public/images/show_deliverable_detail.png b/public/images/show_deliverable_detail.png new file mode 100644 index 0000000000000000000000000000000000000000..741c76bfeb8b28d302553cb959d9f4e540945ee9 GIT binary patch literal 3198 zcmV-^41x2BP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00050Nkl&l7C{3>;=iyIw9~MOSP3?JTM_)gCKy2!Bxrde z{sIXqriy8;wO4}p5e2P`VhY{Z+zrbxvlBPj7Y^Jz=brbSJ9F+ix7F!%48S<1aTXIe zoS%Qg2Rz5qi1=DZ(5exb!X30x7>q8Ka5Ey_m7P_=ZM?zk4#;~Pvv{3SI@cs{1y8Ww z|Kk9bQc9QW1TNq{T82k~g_P3yvcOR+?vi}_zv59!X}n+HHV!rf-pawPJRXEYnC}T3 z!$o_KODUy^BIkKA0)c&)E^ylDaApk0Yn(Sq^H+W2Rs1gb?^bY3wmO~8M$X}?Y-mJ8 zfRxf!g?ppeqtvX$7}jy3!dKq%YBo5PO-gAH|N0o#Y6PyA=9_&2CoB9_SSzqR!Y}lq zC(s=M`Clv-c#p>;5Lk?ekG&H-kBx?aIc#N{Ygqdu*SGBw@d-0|Tf4;{%tXYOaz9wX zwfu&|qKm5$@v^R?E#&t1YY6h6Xh+0@rk=c%OZdH<`%T!)YbPV(S=C9d!uMS49`;>Z krf?+tKjZCAt}Xut02Engv>{qT-T(jq07*qoM6N<$f={aXs{jB1 literal 0 HcmV?d00001 From f5138d7d8ed4c647a8f09746a1a8c54b1aeacb00 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 20 Nov 2013 09:12:09 -0800 Subject: [PATCH 076/107] Removing Not graded yet as default message for ungraded deliverables --- app/views/deliverables/_edit_student_feedback.html.erb | 4 +--- spec/requests/deliverables_spec.rb | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index 4e934108d..c4f6bf1dd 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -84,9 +84,7 @@
    <% graded_by = @deliverable.get_graded_by %>

    Last graded by: - <% if graded_by.nil? %> - Not graded yet - <%else%> + <% unless graded_by.nil? %> <%= link_to graded_by.human_name, person_path(graded_by.twiki_name), :target=> '_blank'%> <% end %>

    diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index 8c4e4b3c1..90fa49d09 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -229,7 +229,6 @@ find("#deliverable_" + @deliverable1.id.to_s).click page.should have_content("Last graded by") page.should have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) - page.should_not have_content("Not graded yet") end it "I should be able to see default message for last graded by in the grading page if not graded", :js => true do @@ -237,7 +236,6 @@ find("#deliverable_" + @deliverable2.id.to_s).click page.should have_content("Last graded by") page.should_not have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) - page.should have_content("Not graded yet") end it "I should be able to see my last filter options after providing grade/feedback ", :js => true do From 6e29f2eddbf505cd98319e9f3bc472b47f0da353 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 20 Nov 2013 09:45:39 -0800 Subject: [PATCH 077/107] Removing pending tests from deliverables controller --- .../deliverables_controller_spec.rb | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index d1ca7220f..e043ce695 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -132,12 +132,6 @@ @expected_deliverable[0].should == @deliverable_turing_graded end - it 'shows draft deliverables of only my teams if draft buttons is clicked' do - get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id - pending - - end - it 'shows graded and ungraded deliverables of only my teams if graded and ungraded buttons are clicked' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) @@ -149,21 +143,6 @@ @expected_deliverable[1].should == @deliverable_turing_ungraded end - - it 'shows graded, ungraded and drafted deliverables of only my teams if graded, ungraded and draft buttons are clicked' do - get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id - pending - end - - it 'shows graded and drafted deliverables of only my teams if graded and draft buttons are clicked' do - get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id - pending - end - - it 'shows ungraded and drafted deliverables of only my teams if ungraded and draft buttons are clicked' do - get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id - pending - end ## end add Team turing end From 485d09ee193ad7d14d899f66cffd9d694d486489 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 20 Nov 2013 10:27:15 -0800 Subject: [PATCH 078/107] Fixing failing tests --- spec/controllers/deliverables_controller_spec.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index e043ce695..fcd87b805 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -108,15 +108,14 @@ get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id @expected_deliverable = assigns(:deliverables) - @expected_deliverable.should have(2).items + @expected_deliverable.should have(1).items @expected_deliverable[0].should == @deliverable_turing_ungraded - @expected_deliverable[1].should == @deliverable_turing_drafted end #default behavior it 'shows the deliverables that matches the selected deliverable name' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) - get :filter_deliverables, :assignment_id => @assignment_ungraded.id, :filter_options => {:graded => "1", :ungraded => "1", :drafted => "1"}, :course_id => @course.id + get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => "1", :drafted => "1", :assignment_id => @assignment_ungraded.id.to_s}, :course_id => @course.id @expected_deliverable = assigns(:deliverables) @expected_deliverable.should have(1).items @@ -125,7 +124,7 @@ it 'shows graded deliverables if graded buttons is clicked' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) - get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => 0, :drafted => 0}, :course_id => @course.id + get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => 0, :drafted => 0, :assignment_id => ""}, :course_id => @course.id @expected_deliverable = assigns(:deliverables) @expected_deliverable.should have(1).items @@ -135,12 +134,12 @@ it 'shows graded and ungraded deliverables of only my teams if graded and ungraded buttons are clicked' do subject.instance_variable_set(:@default_deliverables, [@deliverable_turing_ungraded, @deliverable_turing_drafted, @deliverable_turing_graded]) - get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => "1"}, :course_id => @course.id + get :filter_deliverables, :filter_options => {:graded => "1", :ungraded => "1", :assignment_id => ""}, :course_id => @course.id @expected_deliverable = assigns(:deliverables) @expected_deliverable.should have(2).items - @expected_deliverable[0].should == @deliverable_turing_graded - @expected_deliverable[1].should == @deliverable_turing_ungraded + @expected_deliverable[1].should == @deliverable_turing_graded + @expected_deliverable[0].should == @deliverable_turing_ungraded end ## end add Team turing From ed4628fa690018291554e80a82aeae839887560b Mon Sep 17 00:00:00 2001 From: ira jain Date: Wed, 20 Nov 2013 13:11:13 -0800 Subject: [PATCH 079/107] Firts graded by patch --- app/models/grade.rb | 4 +++- spec/models/grade_spec.rb | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/models/grade.rb b/app/models/grade.rb index 23daa2c3f..a9dcd9f8b 100644 --- a/app/models/grade.rb +++ b/app/models/grade.rb @@ -108,7 +108,9 @@ def self.give_grade(course_id, assignment_id, student_id, score, is_student_visi end # Beg Add Turing Ira unless last_graded_by.nil? - grade.last_graded_by = last_graded_by + if grade.last_graded_by.nil? + grade.last_graded_by = last_graded_by + end end # End Add Turing Ira grading_result = grade.save diff --git a/spec/models/grade_spec.rb b/spec/models/grade_spec.rb index 450bd8b14..d9e4fa02e 100644 --- a/spec/models/grade_spec.rb +++ b/spec/models/grade_spec.rb @@ -182,6 +182,19 @@ Grade.give_grade(@course_fse.id, @assignment_1.id, @student_sam.id, score,nil,faculty).should be_true Grade.find_by_assignment_id_and_student_id(@assignment_1.id, @student_sam.id).last_graded_by.should eq(faculty) end + + it "should not update faculty in last graded by when last graded by is not empty" do + faculty_frank = FactoryGirl.build(:faculty_frank_user) + faculty_fagan = FactoryGirl.build(:faculty_fagan_user) + faculty = faculty_frank.id + score = "10" + score1 = "7" + + Grade.give_grade(@course_fse.id, @assignment_1.id, @student_sam.id, score,nil,faculty).should be_true + Grade.give_grade(@course_fse.id, @assignment_1.id, @student_sam.id, score1,nil,faculty_fagan.id).should be_true + + Grade.find_by_assignment_id_and_student_id(@assignment_1.id, @student_sam.id).last_graded_by.should eq(faculty) + end end # End Add Turing Ira From 9d0514c19b58624017a5dccb8c138818e9b34fbb Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 20 Nov 2013 14:10:35 -0800 Subject: [PATCH 080/107] removing save_and_open_page --- spec/requests/deliverables_spec.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index 90fa49d09..87b4414b7 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -186,9 +186,6 @@ it "I should be able to view only my teams deliverables", :js => true do visit course_deliverables_path(@course) - #for debugging - save_and_open_page - page.should have_content("Task 1") page.should have_content("Task 2") page.should_not have_content("Task 3") From fec3b8d1b10fc38ed29d66f839772744f5bf5bb7 Mon Sep 17 00:00:00 2001 From: ira jain Date: Wed, 20 Nov 2013 15:16:25 -0800 Subject: [PATCH 081/107] Grade Book- Last graded by --- app/controllers/grades_controller.rb | 5 ++++- app/models/grade.rb | 8 ++++++-- spec/models/grade_spec.rb | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/controllers/grades_controller.rb b/app/controllers/grades_controller.rb index 3d6e8c2bc..374237dad 100644 --- a/app/controllers/grades_controller.rb +++ b/app/controllers/grades_controller.rb @@ -80,7 +80,10 @@ def post_drafted_and_send #and send email def save grades = params["grades"] - Grade.give_grades(grades) + #Beg add Turing + #Grade.give_grades(grades) + Grade.give_grades(grades,current_user.id) + # End add Turing render :json => ({"message"=>"true"}) end diff --git a/app/models/grade.rb b/app/models/grade.rb index a9dcd9f8b..2f144c71c 100644 --- a/app/models/grade.rb +++ b/app/models/grade.rb @@ -122,10 +122,14 @@ def self.give_grade(course_id, assignment_id, student_id, score, is_student_visi end # To assign grades for to multiple students. - def self.give_grades(grades) + # Beg Chg Turing + #def self.give_grades(grades) + def self.give_grades(grades,last_graded_by= nil) + #End Chg Turing grades.each do |grade_entry| # FIXME: error handling for update failure - self.give_grade(grade_entry[:course_id], grade_entry[:assignment_id], grade_entry[:student_id], grade_entry[:score], grade_entry[:is_student_visible]) + # self.give_grade(grade_entry[:course_id], grade_entry[:assignment_id], grade_entry[:student_id], grade_entry[:score], grade_entry[:is_student_visible]) + self.give_grade(grade_entry[:course_id], grade_entry[:assignment_id], grade_entry[:student_id], grade_entry[:score], grade_entry[:is_student_visible],last_graded_by) end end diff --git a/spec/models/grade_spec.rb b/spec/models/grade_spec.rb index d9e4fa02e..a8a31d63b 100644 --- a/spec/models/grade_spec.rb +++ b/spec/models/grade_spec.rb @@ -195,6 +195,22 @@ Grade.find_by_assignment_id_and_student_id(@assignment_1.id, @student_sam.id).last_graded_by.should eq(faculty) end + + it "should be able to update multiple grades with last graded by in grade book" do + faculty_frank = FactoryGirl.build(:faculty_frank_user) + faculty = faculty_frank.id + grades = [] + + [@assignment_1, @assignment_2].each do |assignment| + grades << {:course_id=>@course_fse.id, :assignment_id => assignment.id, :student_id=>@student_sam.id, :score => "10" } + end + + Grade.give_grades(grades,faculty) + grades.each do |grade_entry| + Grade.find_by_assignment_id_and_student_id(grade_entry[:assignment_id], grade_entry[:student_id]).last_graded_by.should eq(faculty) + end + end + end # End Add Turing Ira From c9398f7bb82f5cbb57ef9619a0b455a3545a6628 Mon Sep 17 00:00:00 2001 From: Mia Manalastas Date: Wed, 20 Nov 2013 23:17:53 -0800 Subject: [PATCH 082/107] Add grade book confirm box, checkbox and modify button label and position --- app/views/grades/index.html.erb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/views/grades/index.html.erb b/app/views/grades/index.html.erb index 4ba2ece9a..53d2aadb1 100644 --- a/app/views/grades/index.html.erb +++ b/app/views/grades/index.html.erb @@ -109,6 +109,7 @@ } function post_drafted_and_send() { + if (!confirm("Do you want to finalize draft grades and send to students?")) return; // Added by Team Turing post_grades('<%=post_drafted_and_send_path(@course)%>'); } @@ -206,9 +207,21 @@
From 5d009a6d86a6f4ea52a8ba1a637a9f8c6c855632 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Thu, 21 Nov 2013 00:05:03 -0800 Subject: [PATCH 083/107] Cont. redesign of grading queue --- .../deliverables/_deliverable_listing_professor.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index 89b70b647..e950b87ed 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -44,7 +44,7 @@
- <%= image_tag("/images/show_deliverable_detail.png", :style => 'margin-left: -6px') %> + <%= image_tag("/images/show_deliverable_detail.png", :style => 'margin-left: -6px', :alt => 'View details') %>
@@ -72,11 +72,11 @@
<% if deliverable.get_grade_status == :graded %> - <%= image_tag("/images/deliverables_graded.png", :size => '54x54', :class => 'pull-right') %> + <%= image_tag("/images/deliverables_graded.png", :alt => 'Graded', :size => '54x54', :class => 'pull-right') %> <% elsif deliverable.get_grade_status == :drafted %> - <%= image_tag("/images/deliverables_drafted.png", :size => '54x54', :class => 'pull-right') %> + <%= image_tag("/images/deliverables_drafted.png", :alt => 'Drafted', :size => '54x54', :class => 'pull-right') %> <% elsif deliverable.get_grade_status == :ungraded %> - <%= image_tag("/images/deliverables_ungraded.png", :size => '54x54', :class => 'pull-right') %> + <%= image_tag("/images/deliverables_ungraded.png", :alt => 'Ungraded', :size => '54x54', :class => 'pull-right') %> <% end %>
From b863f3c133ed3ac12c4d6d9bccd4547f21e7dea6 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Thu, 21 Nov 2013 16:57:15 -0800 Subject: [PATCH 084/107] Modifying travis configuration file to run firefox --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8dae2c3db..6c95c7d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ language: ruby rvm: 1.9.2 +before_install: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + before_script: - "psql -c 'create database cmu_education_test;' -U postgres >/dev/null" - cp config/amazon_s3.default.yml config/amazon_s3.yml From 2acff4b4e72efb8ce044e7237e280cab23b3f2f8 Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Fri, 22 Nov 2013 13:58:47 -0800 Subject: [PATCH 085/107] Implement search function w/o test --- app/controllers/deliverables_controller.rb | 45 +++++++++ app/models/deliverable.rb | 91 +++++++++++++++++++ .../deliverables/get_deliverables.js.erb | 2 + .../grading_queue_for_course.html.erb | 31 +++++-- config/routes.rb | 1 + 5 files changed, 162 insertions(+), 8 deletions(-) create mode 100644 app/views/deliverables/get_deliverables.js.erb diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 5ef71463a..242a565a2 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -70,6 +70,51 @@ def grading_queue_for_course end + def get_deliverables + + @course = Course.find_by_id(params[:course_id]) + + @selected_options = [] + + params[:filter_options].collect do |grading_filter_option| + @selected_options << grading_filter_option[0].to_sym if grading_filter_option[1] == "1" + end + + options = {} + + if params[:filter_options][:search_box] != "" + options[:search_string] = params[:filter_options][:search_box] + end + + if params[:filter_options][:is_my_teams] == 'yes' + options[:is_my_team] = 1 + else + options[:is_my_team] = 0 + end + + @faculty_deliverables = Deliverable.get_deliverables(params[:course_id], current_user.id, options) + + @deliverables = [] + + # Filter according to the selected grading options + @selected_options.each do |option| + @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + end + + # Filter by assignment names in drop down menu + unless params[:filter_options][:assignment_id].empty? or params[:filter_options][:assignment_id] == '-1' + @deliverables = @deliverables.select{ |deliverable| deliverable.assignment_id == params[:filter_options][:assignment_id].to_i } + end + + # Sort by task number, ascending + @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } + + respond_to do |format| + format.js #{ redirect_to course_deliverables_path(@course) } + end + + end + def filter_deliverables @course = Course.find_by_id(params[:course_id]) diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index 31351dbee..0c0734af2 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -57,6 +57,97 @@ class Deliverable < ActiveRecord::Base after_save :inaccurate_course_and_assignment_check + + def self.get_deliverables(course_id, faculty_id, options = nil) + + sql_template = "SELECT d.id FROM deliverables d LEFT JOIN teams t ON d.team_id = t.id LEFT JOIN team_assignments ta ON t.id = ta.team_id LEFT JOIN users u1 ON d.creator_id = u1.id LEFT JOIN users u2 ON ta.user_id = u2.id" + + where_clause_course = " WHERE d.course_id = ?" + + where_clause_team_deliverable = " AND d.team_id IS NOT NULL AND t.primary_faculty_id = ?" + + where_clause_individual_deliverable = " AND d.team_id IS NULL AND d.creator_id IN (SELECT inner_ta.user_id FROM teams inner_t, team_assignments inner_ta WHERE inner_t.id = inner_ta.team_id AND inner_t.primary_faculty_id = ?)" + + where_clause_search = " AND (u1.first_name ILIKE ? OR u1.last_name ILIKE ? OR u1.human_name ILIKE ? OR u1.email ILIKE ? OR u2.first_name ILIKE ? OR u2.last_name ILIKE ? OR u2.human_name ILIKE ? OR u2.email ILIKE ? OR t.name ILIKE ?)" + + queue = [] + + # Test setup + #options = {:is_my_team => 1, :search_string => "David"} + + # 1. Are there teams in this course? If there are, and the "filter by teams is on", filter by teams + # 2. If there are no teams in the course, and if this deliverable is an individual deliverable, + # show deliverables for individuals who are in the faculty's teams only. + # 3. Otherwise, show every deliverable + + course_has_teams = Team.where(:course_id => course_id).any? + + has_search_string = !options[:search_string].nil? + selected_my_team = (options[:is_my_team] == 1) + + if has_search_string + search_string = options[:search_string] + end + + if !course_has_teams + + if has_search_string + sql = sql_template + where_clause_course + where_clause_search + deliverable_ids = Deliverable.find_by_sql([sql, course_id, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string]).uniq + else + sql = sql_template + where_clause_course + deliverable_ids = Deliverable.find_by_sql([sql, course_id]).uniq + end + + elsif selected_my_team + + if has_search_string + sql = sql_template + where_clause_course + where_clause_team_deliverable + where_clause_search + team_deliverable_ids = Deliverable.find_by_sql([sql, course_id, faculty_id, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string]).uniq + + sql = sql_template + where_clause_course + where_clause_individual_deliverable + where_clause_search + individual_deliverable_ids = Deliverable.find_by_sql([sql, course_id, faculty_id, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string]).uniq + else + sql = sql_template + where_clause_course + where_clause_team_deliverable + team_deliverable_ids = Deliverable.find_by_sql([sql, course_id, faculty_id]).uniq + + sql = sql_template + where_clause_course + where_clause_individual_deliverable + individual_deliverable_ids = Deliverable.find_by_sql([sql, course_id, faculty_id]).uniq + end + + deliverable_ids = [] + + team_deliverable_ids.each do |team_deliverable_id| + deliverable_ids << team_deliverable_id + end + + individual_deliverable_ids.each do |individual_deliverable_id| + deliverable_ids << individual_deliverable_id + end + + else + + if has_search_string + sql = sql_template + where_clause_course + where_clause_search + deliverable_ids = Deliverable.find_by_sql([sql, course_id, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string, search_string]).uniq + else + sql = sql_template + where_clause_course + deliverable_ids = Deliverable.find_by_sql([sql, course_id]).uniq + end + + end + + deliverables = [] + + deliverable_ids.each do |deliverable_id| + deliverables << Deliverable.find(deliverable_id) + end + + return deliverables + + end + + def self.grading_queue_display(course_id, faculty_id, options = nil) # Default grading queue filters diff --git a/app/views/deliverables/get_deliverables.js.erb b/app/views/deliverables/get_deliverables.js.erb new file mode 100644 index 000000000..e56d06b71 --- /dev/null +++ b/app/views/deliverables/get_deliverables.js.erb @@ -0,0 +1,2 @@ +$("#grading_queue").detach(); +$("#deliverables").append($("<%= escape_javascript(render partial: 'deliverable_listing_professor', :locals => {:deliverables => @deliverables, :skip_course_column => true}) %>")) \ No newline at end of file diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 20ce07dd4..07e6b0d4d 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -125,6 +125,10 @@ $("#filter_options_assignment_id").val($(this).attr("id")); $('#filter_options_new').submit(); }); + + $('#search_box').keyup(function(){ + $('#filter_options_new').submit(); + }); }); var filter_graded = function() { @@ -144,6 +148,16 @@ $('#filter_options_new').submit(); }; + + // TODO David will implement the search box keyup listener + $('#search_box').keyup(function(){ + $('#filter_options_new').submit(); + }); + + // TODO David will implement the function that saves selected options to session + function setSessionInfo() { + + } @@ -175,16 +189,17 @@ <%= image_tag("/images/ajax-loader.gif", :class => "ajax-loader") %>
- -
- -
- + + <%= form_for @filter_options, :as => :filter_options, :url => {:action => "get_deliverables", :id => params[:id]}, :remote => true do |f| %> + <%#= form_for @filter_options, :as => :filter_options, :url => {:action => "filter_deliverables", :id => params[:id]}, :remote => true do |f| %> + +
+ <%= f.text_field :search_box, { :id => "search_box", :class => "form-control", :placeholder => "Search for student, team, Andrew ID..." } %> +
+ -
+
- - <%= form_for @filter_options, :as => :filter_options, :url => {:action => "filter_deliverables", :id => params[:id]}, :remote => true do |f| %>
diff --git a/config/routes.rb b/config/routes.rb index d5cee273c..db31d9c2d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -151,6 +151,7 @@ match 'courses/:course_id/team_formation_tool' => 'courses#team_formation_tool', :as => :team_formation_tool match 'courses/:course_id/student_grades' => 'grades#student_deliverables_and_grades_for_course', :as => :course_student_grades match 'courses/:course_id/deliverables' => 'deliverables#grading_queue_for_course', :as => :course_deliverables + match 'courses/:course_id/get_deliverables' => 'deliverables#get_deliverables', :as => :get_deliverables match 'courses/:course_id/filter_deliverables' => 'deliverables#filter_deliverables', :as => :filter_deliverables match 'courses/:course_id/update_feedback' => 'deliverables#update_feedback', :as => :update_feedback match 'courses/:course_id/presentations' => 'presentations#index_for_course', :as => :course_presentations From a3fab98f51fd96d338099020533d4066733f555a Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Fri, 22 Nov 2013 14:05:28 -0800 Subject: [PATCH 086/107] Grading queue interface changes. Default grading queue behavior changed to ungraded + drafted. --- app/controllers/deliverables_controller.rb | 17 ++---- .../_deliverable_listing_professor.html.erb | 8 +-- .../_edit_student_feedback.html.erb | 20 +------ .../grading_queue_for_course.html.erb | 17 +++--- app/views/deliverables/show.html.erb | 56 +----------------- public/images/hide_deliverable_detail.png | Bin 3179 -> 3519 bytes public/images/show_deliverable_detail.png | Bin 3198 -> 3210 bytes 7 files changed, 16 insertions(+), 102 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 5ef71463a..6b7e37569 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -47,21 +47,14 @@ def grading_queue_for_course @deliverables = Deliverable.where(:course_id => @course.id).all elsif @course.faculty.include?(current_user) - #@default_deliverables = default_deliverables(params[:course_id], current_user.id) - #@filtered_deliverables = @default_deliverables + + # Get all deliverables for this team/student or all students @deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) - #if @last_filter_options == nil - # @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } - #else - # @temp = [] - # @last_filter_options.each do |option| - # @temp.concat(@deliverables.select { |deliverable| deliverable.get_grade_status == option[0] if option[1] == "1"}) - # end - # @deliverables = @temp - #end - @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded } + # Select all that are ungraded or drafted + @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded || deliverable.get_grade_status == :drafted } + # Sort by task number @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } else diff --git a/app/views/deliverables/_deliverable_listing_professor.html.erb b/app/views/deliverables/_deliverable_listing_professor.html.erb index e950b87ed..808f549a8 100644 --- a/app/views/deliverables/_deliverable_listing_professor.html.erb +++ b/app/views/deliverables/_deliverable_listing_professor.html.erb @@ -44,7 +44,7 @@
- <%= image_tag("/images/show_deliverable_detail.png", :style => 'margin-left: -6px', :alt => 'View details') %> + <%= image_tag("/images/show_deliverable_detail.png", :size => '28x28', :style => 'margin-left: -6px', :alt => 'View details', :id => 'toggle_img') %>
@@ -64,12 +64,6 @@
- -
<% if deliverable.get_grade_status == :graded %> <%= image_tag("/images/deliverables_graded.png", :alt => 'Graded', :size => '54x54', :class => 'pull-right') %> diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index c4f6bf1dd..ab6642d46 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -33,22 +33,6 @@ // Team Turing End - - -
@@ -83,7 +67,7 @@
<% graded_by = @deliverable.get_graded_by %> -

Last graded by: +

Graded by: <% unless graded_by.nil? %> <%= link_to graded_by.human_name, person_path(graded_by.twiki_name), :target=> '_blank'%> <% end %> @@ -157,7 +141,7 @@

- <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default", :onclick => "toggle_slide();" %> + <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default" %>
diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 9cf73b601..331a65f52 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -28,25 +28,22 @@ }); $(document).on('click', '.ajax', function() { - //$(this).find('#loading_indicator').show(); var deliverable = $(this); $.get('/deliverables/' + $(this).find('#deliverable_id').text(), function(response){ - //console.log(response) deliverable.siblings().html(response); - //alert("started!"); } ) - //.always(function(data) { - // deliverable.find('#loading_indicator').hide(); - //}); $(this).removeClass('ajax'); }); $(document).on('click', '.deliverable', function() { - //console.log("Correct toggle example:"); - //console.log($(this)); $(this).siblings().slideToggle(); + + // Figure out the toggle state to show + or - sign + var toggle_state = $(this).parent().find('#toggle_img').attr('src'); + toggle_state = toggle_state.substr(0, 12) == '/images/show' ? '/images/hide_deliverable_detail.png' : '/images/show_deliverable_detail.png'; + $(this).parent().find('#toggle_img').attr('src', toggle_state); }); @@ -193,8 +190,8 @@ -
@@ -96,60 +96,6 @@ - - - <% if current_user.is_admin? || @course.faculty.include?(current_user) %> <%= render :partial => "edit_student_feedback", :locals => {:button_name => "Submit"} %> <%# link_to "Alter feedback", deliverable_feedback_path(@deliverable) %> diff --git a/public/images/hide_deliverable_detail.png b/public/images/hide_deliverable_detail.png index d5712a5a033341aaf5c47dff5142bad2976b837b..3b137f3b75fb4cbfec522050e507791437229d57 100644 GIT binary patch delta 817 zcmV-11J3;G7{41KiBL{Q4GJ0x0000DNk~Le0000S0000S2nGNE0CElAl(8Y63V#CX zNklQ&;zO`h56&zV9dR_viij zeqK$})6@P(DO|=?WHE^LcK8f9@!-2Ol7n$znN4SIeN`IwdX=&-)VT+54 zDwT@3l6NC);ZrCUi|Y0Ixxx1L_Z5r9#`I(S8R0&@#rHcqJ7#BR&kZ;`JF8l)isRo5 zA>3~~4Q0HC#r5@dg+k$>VTD4W(Ja5?S_om|=!<_FZ{XhQ>Z+NU8MRvNOm}W(X2$C3 zDs14*5W>#~j$mS9;(viN#!tvqtJNn~R#r4MHA$sXCxR_3ESQ^{v$eGazr?UxC$Wi7 z$2KuQGMSW4rw?pmTU#5b)oKSeu~aHGx)Hv_^$^0{(-`4yT*0;2ai2s#;-k1hD*v{j v`IwLYz!&)8h}C~8HeHQoTRM%^|9b$r!Ub$fK)fCR0000K#SncW7raoFT^1WWxan#IQv7j!S$LMtos ze9~|@fcXsPOi$;VI9U_CS?a&R>*DzgPM6|$D;TXtp6A^nhpVz-s3HQSlz+A>!rg2_ zsadNgHgKvUR-W=&(co;+q?88nH=0%mK0$MzWT9XGoiBL{Q4GJ0x0000DNk~Le0000S0000S2nGNE0CElAl(8Y73V*dp zL_t(|+Pv1iYZO5k$MMfC*H~#HDuNIpbx=&9A_%_VD-wh>qE$dU?L>qdo98c3TQ!Yn z6;zZ!1hqFPK@w0@v`;jmg=K8!3XjX(UUJ!Qw>$IfmzjNr`PCYYhAs?Z1Y;P*Zfwe9 zfAJ0P@C@@2@w3y%Y8`~zaSm6pM}Ilya0f3UVzJ$XVwJ)}c#L~J$Y3uX;899xw5;$v zrf}5SIgY86(y4C3G2F)v>t_fLQ%WaS6CTdnF`$2J#biq9K&x;YZsm^bH#^ZtDGfqB zzdVCuWvV0Mzvq-vnXV+GTAi4)zbdTf#=)0l~fmF9i8h#NV9^_#D_84*jZH~t(h<3}H5 zOSlpdA6CmWuW%8c`XKv=OHC2+x?5_S!8o3*L-rKo5iwIXm(F7%i+edT?{NVW5wXy2 uLcK%rubfZcv_$=(9J-p#_Pv*=|8D>`=WuI((hG0^0000yJ!JdcfrfH`bsn`>D6BiFa>67dN$d0V^1AIwC=mvTQ?!L|H` z!=j6;5%IFFqb=n2_iG69pFwCx#Dk`uyp&7$y`1|^*vxAuBjQ=rNv^{8TO+(?M|*O{{{dQS!c8%T0-6c0000 Date: Fri, 22 Nov 2013 15:05:18 -0800 Subject: [PATCH 087/107] Updating tests to meet latest functionality. Hopefully Travis is green now :) --- .../deliverables_controller_spec.rb | 9 ++++---- spec/factories/deliverables.rb | 2 -- spec/factories/teams.rb | 2 -- spec/models/deliverable_model_spec.rb | 6 +++--- spec/requests/deliverables_spec.rb | 21 ++++++++----------- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index fcd87b805..2db6b1b91 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -69,9 +69,9 @@ #@team_turing_assignment = FactoryGirl.create(:team_turing_assignment, :team => @team_turing, :user => @student_sam) #@team_test_assignment = FactoryGirl.create(:team_test_assignment, :team => @team_test, :user => @student_sally) - @deliverable_turing_ungraded = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment_ungraded) - @deliverable_turing_drafted = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment_drafted) - @deliverable_turing_graded = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment_graded) + @deliverable_turing_ungraded = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment_ungraded, :creator => @student_sam) + @deliverable_turing_drafted = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment_drafted, :creator => @student_sam) + @deliverable_turing_graded = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing,:assignment => @assignment_graded, :creator => @student_sam) @deliverable_test_ungraded = FactoryGirl.create(:team_test_deliverable_1,:course => @course, :team => @team_test,:assignment => @assignment_ungraded) @da_turing_ungraded = FactoryGirl.create(:attachment_1, :deliverable => @deliverable_turing_ungraded, :submitter => @student_sam) @@ -108,8 +108,9 @@ get :grading_queue_for_course, :course_id => @course.id , :faculty_id =>@faculty_frank.id @expected_deliverable = assigns(:deliverables) - @expected_deliverable.should have(1).items + @expected_deliverable.should have(2).items @expected_deliverable[0].should == @deliverable_turing_ungraded + @expected_deliverable[1].should == @deliverable_turing_drafted end #default behavior diff --git a/spec/factories/deliverables.rb b/spec/factories/deliverables.rb index f4845c534..37e1f52ce 100644 --- a/spec/factories/deliverables.rb +++ b/spec/factories/deliverables.rb @@ -24,7 +24,6 @@ factory :team_turing_deliverable_1, :parent => :deliverable do association :assignment, :factory => :assignment association :team, :factory => :team_turing - association :creator, :factory => :student_john_user association :course, :factory => :fse private_note "My first deliverable" end @@ -32,7 +31,6 @@ factory :team_turing_deliverable_2, :parent => :deliverable do association :assignment, :factory => :assignment association :team, :factory => :team_turing - association :creator, :factory => :student_john_user association :course, :factory => :fse private_note "My second deliverable" end diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb index ffbbbc8ed..cfd8e386e 100644 --- a/spec/factories/teams.rb +++ b/spec/factories/teams.rb @@ -33,8 +33,6 @@ association :course, :factory => :fse - after(:create) { |team| FactoryGirl.create(:student_john_user , :teams => [team])} - end diff --git a/spec/models/deliverable_model_spec.rb b/spec/models/deliverable_model_spec.rb index 5abb3d882..52a5ecc37 100644 --- a/spec/models/deliverable_model_spec.rb +++ b/spec/models/deliverable_model_spec.rb @@ -209,8 +209,8 @@ @assignment1 = FactoryGirl.create(:assignment_1,:course => @course_fse) @assignment2 = FactoryGirl.create(:assignment_1,:course => @course_fse) - @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment1) - @deliverable2 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment2) + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment1, :creator => @student_sam) + @deliverable2 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment2, :creator => @student_sam) @deliverable3 = FactoryGirl.create(:team_test_deliverable_1,:course => @course_fse, :team => @team_test,:assignment => @assignment1) @dav1 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) @@ -265,7 +265,7 @@ @assignment2 = FactoryGirl.create(:assignment_3,:course => @course_fse) # Team deliverable - @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment1) + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment1, :creator => @student_sam) # Individual deliverable 1 @deliverable2 = FactoryGirl.create(:turing_individual_deliverable,:course => @course_fse, :assignment => @assignment1, :creator => @student_sam) # Individual deliverable 2 diff --git a/spec/requests/deliverables_spec.rb b/spec/requests/deliverables_spec.rb index 87b4414b7..8d01b4303 100644 --- a/spec/requests/deliverables_spec.rb +++ b/spec/requests/deliverables_spec.rb @@ -140,26 +140,24 @@ @faculty_assignment = FactoryGirl.create(:faculty_assignment, :course_id => @course.id, :user_id => @faculty.id) @team_deliverable.course = @course - - #@course_fse = FactoryGirl.create(:fse, faculty: [@faculty]) - #@course_ise = FactoryGirl.create(:ise, faculty: [@faculty]) @student_sam = FactoryGirl.create(:student_sam) - #@student_sally = FactoryGirl.create(:student_sally) - @team_turing = FactoryGirl.create(:team_turing, :course=>@course) + @team_turing.members = [@student_sam] + @team_test = FactoryGirl.create(:team_test, :course=>@course) @team_assignment = FactoryGirl.create(:team_turing_assignment, :team => @team_turing, :user => @student_sam) @assignment1 = FactoryGirl.create(:assignment_1,:course => @course) @assignment2 = FactoryGirl.create(:assignment_2,:course => @course) - @grade1 = FactoryGirl.create(:last_graded_visible, :course => @course,:assignment => @assignment1, :last_graded_by => @faculty.id, :student =>@student_sam) + @grade1 = FactoryGirl.create(:grade_invisible, :course => @course,:assignment => @assignment1, :last_graded_by => @faculty.id, :student =>@student_sam) - @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing, :assignment => @assignment1, :attachment_versions => []) - @deliverable2 = FactoryGirl.create(:team_turing_deliverable_2,:course => @course, :team => @team_turing,:assignment => @assignment2, :attachment_versions => []) + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course, :team => @team_turing, :assignment => @assignment1, :attachment_versions => [], :creator => @student_sam) + @deliverable2 = FactoryGirl.create(:team_turing_deliverable_2,:course => @course, :team => @team_turing,:assignment => @assignment2, :attachment_versions => [], :creator => @student_sam) @deliverable3 = FactoryGirl.create(:team_test_deliverable_1,:course => @course, :team => @team_test,:assignment => @assignment1, :attachment_versions => []) + @dav1 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sam) @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sam) @@ -208,13 +206,12 @@ it "I should be able to click deliverable to open accordion and check content of grading page", :js => true do visit course_deliverables_path(@course) - find("#deliverable_" + @deliverable1.id.to_s).click # page.should have_content("Attachment Version History") page.should have_content("History") page.should have_content("Professor's Notes") page.should have_content("My first deliverable") - page.should have_content("Last graded by") + page.should have_content("Graded by") page.should have_content("Send a copy to myself") page.should have_button("Save as Draft") page.should have_button("Finalize and Email") @@ -224,14 +221,14 @@ it "I should be able to see who last graded in the grading page", :js => true do visit course_deliverables_path(@course) find("#deliverable_" + @deliverable1.id.to_s).click - page.should have_content("Last graded by") + page.should have_content("Graded by") page.should have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) end it "I should be able to see default message for last graded by in the grading page if not graded", :js => true do visit course_deliverables_path(@course) find("#deliverable_" + @deliverable2.id.to_s).click - page.should have_content("Last graded by") + page.should have_content("Graded by") page.should_not have_link(@faculty.human_name.to_s, href: person_path(@faculty.twiki_name)) end From b7df9e872b308e4e28b8b0ce62218ed1bf07f87c Mon Sep 17 00:00:00 2001 From: Mia Manalastas Date: Fri, 22 Nov 2013 22:37:41 -0800 Subject: [PATCH 088/107] Include professor in grade email for Grade Book and Grade Page --- app/controllers/deliverables_controller.rb | 9 ++++- app/controllers/grades_controller.rb | 18 ++++++++-- app/models/deliverable.rb | 35 ++++++++++++++++--- app/models/grade.rb | 21 +++++++---- .../_edit_student_feedback.html.erb | 3 +- app/views/grades/index.html.erb | 20 ++++++++--- 6 files changed, 87 insertions(+), 19 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index d8bf0e9c2..4b2e4f20f 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -404,9 +404,16 @@ def update_feedback #flash[:error] = @deliverable.update_grade(params, is_student_visible) flash[:error] = @deliverable.update_grade(params, is_student_visible, current_user.id) # End chg Turing Ira + # Begin Add Team Turing + other_email = nil + if params[:send_copy_to_myself] == "1" + other_email = current_user.email + end + # End Add Team Turing if @deliverable.update_feedback_and_notes(params[:deliverable]) if is_student_visible==true - @deliverable.send_deliverable_feedback_email(url_for(@deliverable)) + #@deliverable.send_deliverable_feedback_email(url_for(@deliverable)) # Delete Team Turing + @deliverable.send_deliverable_feedback_email(url_for(@deliverable), other_email) # Add Team Turing end else flash[:error] << 'Unable to save feedback' diff --git a/app/controllers/grades_controller.rb b/app/controllers/grades_controller.rb index 374237dad..17f5a5867 100644 --- a/app/controllers/grades_controller.rb +++ b/app/controllers/grades_controller.rb @@ -74,7 +74,14 @@ def student_deliverables_and_grades_for_course def post_drafted_and_send #and send email grades = params["grades"] - Grade.mail_drafted_grade(@course.id, request.host_with_port ) + # Begin Add Team Turing + other_email = nil + if params[:send_copy_to_myself] == "1" + other_email = current_user.email + end + Grade.mail_drafted_grade(@course.id, request.host_with_port, other_email) + # End Add Team Turing + #Grade.mail_drafted_grade(@course.id, request.host_with_port ) # Delete Team Turing render :json => ({"message"=>"true"}) end @@ -89,7 +96,14 @@ def save def send_final_grade grades = params["grades"] - Grade.mail_final_grade(@course.id, request.host_with_port) + # Begin Add Team Turing + other_email = nil + if params[:send_copy_to_myself] == "1" + other_email = current_user.email + end + Grade.mail_final_grade(@course.id, request.host_with_port, other_email) + # End Add Team Turing + #Grade.mail_final_grade(@course.id, request.host_with_port) # Delete Team Turing render :json => ({"message"=>"true"}) end diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index 0c0734af2..0abcfa61c 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -305,7 +305,8 @@ def send_deliverable_upload_email(url) end # To send the feedback to the each student along with the score received respectively. - def send_feedback_to_student(member_id, member_email, url) + #def send_feedback_to_student(member_id, member_email, url) # Delete Team Turing + def send_feedback_to_student(member_id, member_email, url, other_email=nil) # Add Team Turing feedback = "Feedback has been submitted for " if !self.assignment.task_number.nil? and self.assignment.task_number != "" and !self.assignment.name.nil? and self.assignment.name !="" feedback += "#{self.assignment.name} (#{self.assignment.task_number}) of " @@ -328,7 +329,16 @@ def send_feedback_to_student(member_id, member_email, url) feedback += "\n" end - options = {:to => member_email, + # Begin Add Team Turing + if other_email == nil + recipient_list = member_email + else + recipient_list = [member_email, other_email] + end + # End Add Team Turing + + #options = {:to => member_email, # Delete Team Turing + options = {:to => recipient_list, # Add Team Turing :subject => "Feedback for " + self.course.name, :message => feedback, :url_label => "View this deliverable", @@ -337,16 +347,31 @@ def send_feedback_to_student(member_id, member_email, url) GenericMailer.email(options).deliver end + # Begin Delete Team Turing + ## To send the feedback in the email back to the students. + #def send_deliverable_feedback_email(url) + # if self.is_team_deliverable? + # self.team.members.each do |member| + # send_feedback_to_student(member.id, member.email, url) + # end + # else + # send_feedback_to_student(self.creator_id, self.creator.email, url) + # end + #end + # End Delete Team Turing + + # Begin Add Team Turing # To send the feedback in the email back to the students. - def send_deliverable_feedback_email(url) + def send_deliverable_feedback_email(url, other_email=nil) if self.is_team_deliverable? self.team.members.each do |member| - send_feedback_to_student(member.id, member.email, url) + send_feedback_to_student(member.id, member.email, url, other_email) end else - send_feedback_to_student(self.creator_id, self.creator.email, url) + send_feedback_to_student(self.creator_id, self.creator.email, url, other_email) end end + # End Add Team Turing # To check if the current user can change/edit the deliverable def editable?(current_user) diff --git a/app/models/grade.rb b/app/models/grade.rb index 2f144c71c..7e38ceab9 100644 --- a/app/models/grade.rb +++ b/app/models/grade.rb @@ -134,25 +134,25 @@ def self.give_grades(grades,last_graded_by= nil) end # To notify students about the grade that were drafted by professor till now. - def self.mail_drafted_grade(course_id, hostname) + def self.mail_drafted_grade(course_id, hostname, other_email=nil) draft_grades = Grade.find_all_by_is_student_visible_and_course_id(false, course_id) draft_grades.each do |grade| grade.is_student_visible = true grade.save unless (grade.score.blank?) - grade.send_feedback_to_student(hostname) + grade.send_feedback_to_student(hostname, other_email) end end end # To send the final grade mail to students - def self.mail_final_grade(course_id, hostname) + def self.mail_final_grade(course_id, hostname, other_email=nil) final_grades = Grade.find_all_by_course_id_and_assignment_id(course_id, -1) final_grades.each do |grade| unless (grade.score.blank?) grade.is_student_visible = true grade.save - grade.send_feedback_to_student(hostname) + grade.send_feedback_to_student(hostname, other_email) end end end @@ -247,14 +247,23 @@ def make_feedback_for_final_grade end # To send the feedback to the student. - def send_feedback_to_student(hostname) + #def send_feedback_to_student(hostname) # Delete Team Turing + def send_feedback_to_student(hostname, other_email=nil) # Add Team Turing if assignment_id > 0 feedback = make_feedback_for_one_assignment else feedback = make_feedback_for_final_grade end url = hostname + "/courses/#{self.course.id}/student_grades" - options = {:to => self.student.email, + # Begin Add Team Turing + if other_email == nil + recipient_list = self.student.email + else + recipient_list = [self.student.email, other_email] + end + # End Add Team Turing + #options = {:to => self.student.email, # Delete Team Turing + options = {:to => recipient_list, # Add Team Turing :subject => "Grade for " + self.course.name, :message => feedback, :url_label => "Click here to view grade", diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index ab6642d46..7126a7b2a 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -148,7 +148,8 @@
<%= f.submit "Finalize and Email", :name => "submit", :class => "btn btn-primary btn-lg", :style => "color: white; font-size: 14px;", :onclick => "toggle_slide();" %> - Send a copy to myself + <%= check_box_tag(:send_copy_to_myself, value ="1", checked = true) %> + <%= label_tag(:send_copy_to_myself, "Send a copy to myself") %>
diff --git a/app/views/grades/index.html.erb b/app/views/grades/index.html.erb index 53d2aadb1..b0faf8765 100644 --- a/app/views/grades/index.html.erb +++ b/app/views/grades/index.html.erb @@ -109,13 +109,25 @@ } function post_drafted_and_send() { - if (!confirm("Do you want to finalize draft grades and send to students?")) return; // Added by Team Turing - post_grades('<%=post_drafted_and_send_path(@course)%>'); + // Begin Add Team Turing + if (!confirm("Do you want to finalize draft grades and send to students?")) return; + if (document.getElementById("send_copy_to_myself").checked == true) + post_grades('<%=post_drafted_and_send_path(@course, :send_copy_to_myself => 1)%>'); + else + post_grades('<%=post_drafted_and_send_path(@course, :send_copy_to_myself => 0)%>'); + // End Add Team Turing +// post_grades('<%#=post_drafted_and_send_path(@course)%>'); // Delete Team Turing } function send_final_grade() { if (!confirm("Do you want to send all final letter grades (including draft grades) to students?")) return; - post_grades('<%=send_final_grade_path(@course)%>'); + // Begin Add Team Turing + if (document.getElementById("send_copy_to_myself").checked == true) + post_grades('<%=send_final_grade_path(@course, :send_copy_to_myself => 1)%>'); + else + post_grades('<%=send_final_grade_path(@course, :send_copy_to_myself => 0)%>'); + // End Add Team Turing +// post_grades('<%#=send_final_grade_path(@course)%>'); // Delete Team Turing } function save() { @@ -207,7 +219,7 @@
+ <% if current_user.is_student %> <%= link_to 'Upload New Version', edit_deliverable_path(@deliverable) %> <% end %>   
+ <% if index == 0 %> <%= display_timestamp(version.submission_date, :class => "latest") -%> <% else %> <%= display_timestamp(version.submission_date) -%> <% end %> <%if !@deliverable.assignment_due_date.nil? && version.submission_date > @deliverable.assignment_due_date %> - (<%= distance_of_time_in_words(version.submission_date, @deliverable.assignment_due_date)%> late!) + <%= distance_of_time_in_words(version.submission_date, @deliverable.assignment_due_date)%> late! <%end%>
<%= h version.comment -%> 		+ <% unless version.attachment_file_name.nil? %> <%= link_to version.attachment_file_name, version.attachment.url %> <% end %>
<%= link_to image_tag("/images/ajax-loader.gif", :class => "loading", :alt => "Loading" ,:hidden=>"true", :id=>"loading") %> + Send a copy to myself - - + + + + + + +
+
+ +
+ +
+
<% unless version.attachment_file_name.nil? %> - <%= link_to version.attachment_file_name, version.attachment.url %> + <%= link_to 'Download', version.attachment.url %> <% end %>
<%= link_to image_tag("/images/ajax-loader.gif", :class => "loading", :alt => "Loading" ,:hidden=>"true", :id=>"loading") %> - Send a copy to myself + Send a copy to myself From 535e608dcc005388589d9a6e4b4e1eeca261b972 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 25 Nov 2013 11:25:38 -0800 Subject: [PATCH 089/107] fixing bug of rendering deliverables partial not being updated properly --- app/controllers/deliverables_controller.rb | 41 +++++++++++++++++-- .../_edit_student_feedback.html.erb | 18 +++++++- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index d8bf0e9c2..dbfa5495e 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -69,6 +69,7 @@ def get_deliverables @selected_options = [] + # TODO! filter_options in now containing more values than graded, ungraded and drafted params[:filter_options].collect do |grading_filter_option| @selected_options << grading_filter_option[0].to_sym if grading_filter_option[1] == "1" end @@ -121,7 +122,6 @@ def filter_deliverables #keeping last filtering options #@last_filter_options = {:graded => params[:filter_options][:graded], :ungraded => params[:filter_options][:ungraded], :drafted => params[:filter_options][:drafted]} - # TO DO: Don't hit the model again! if params[:filter_options][:is_my_teams] == 'yes' @faculty_deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) else @@ -412,13 +412,46 @@ def update_feedback flash[:error] << 'Unable to save feedback' end + #Obtain current selected filters + @selected_filter_options = JSON.parse(params[:deliverable][:current_filter_options]) + + #Exctract in a new method for both actions: + @course = Course.find_by_id(@deliverable.course_id) + + # Which filtering options are selected? (ungraded - drafted - graded) + @selected_options = [] + @selected_filter_options.collect do |grading_filter_option| + @selected_options << grading_filter_option[0].to_sym if grading_filter_option[1] == "1" + end + + #keeping last filtering options + #@last_filter_options = {:graded => params[:filter_options][:graded], :ungraded => params[:filter_options][:ungraded], :drafted => params[:filter_options][:drafted]} + + if @selected_filter_options[:is_my_teams.to_s] == 'yes' + @faculty_deliverables = Deliverable.grading_queue_display(@deliverable.course_id, current_user.id) + else + @faculty_deliverables = Deliverable.grading_queue_display(@deliverable.course_id, current_user.id, { "is_my_teams" => 0 }) + end + + @deliverables = [] + + # Filter according to the selected grading options + @selected_options.each do |option| + @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + end + + ## Filter by assignment names in drop down menu + #unless params[:filter_options][:assignment_id].empty? or params[:filter_options][:assignment_id] == '-1' + # @deliverables = @deliverables.select{ |deliverable| deliverable.assignment_id == params[:filter_options][:assignment_id].to_i } + #end + + # Sort by task number, ascending + @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } respond_to do |format| if flash[:error].blank? flash[:error] = nil flash[:notice] = 'Feedback successfully saved.' - #format.html {redirect_to(course_deliverables_path(@deliverable.course))} - #format.js #{redirect_to(course_deliverables_path(@deliverable.course))} - format.js { redirect_to(@deliverable) } + format.js else flash[:error] = flash[:error].join("
") format.html { redirect_to(@deliverable) } diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index ab6642d46..d3f797a9b 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -20,6 +20,17 @@ }); }); + var update_filter_options = function() { + var current_filter_options = { + "ungraded": ($('#filter_options_ungraded').is(':checked') ? '1' : ''), + "graded" : ($('#filter_options_graded').is(':checked') ? '1' : ''), + "drafted": ($('#filter_options_drafted').is(':checked') ? '1' : ''), + "is_my_teams" : ($('#filter_options_is_my_teams_yes').is(':checked') ? 'yes' : '') + } + $("#deliverable_current_filter_options").val(''); + $("#deliverable_current_filter_options").val(JSON.stringify(current_filter_options)); + }; + // Team Turing Begin var toggle_slide = function() { @@ -30,6 +41,7 @@ //$('#deliverable_submit_draft').parents('.deliverable_detail').slideUp(); $('.deliverable_detail').slideUp(); }; + // Team Turing End @@ -141,16 +153,18 @@
- <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default" %> + <%= f.submit "Save as Draft", :name => "draft", :class => "btn btn-default", :onclick => "update_filter_options();" %>
- <%= f.submit "Finalize and Email", :name => "submit", :class => "btn btn-primary btn-lg", :style => "color: white; font-size: 14px;", :onclick => "toggle_slide();" %> + <%= f.submit "Finalize and Email", :name => "submit", :class => "btn btn-primary btn-lg", :style => "color: white; font-size: 14px;", :onclick => "toggle_slide(); update_filter_options();" %> Send a copy to myself
+ <%= f.hidden_field :current_filter_options, { value: '' } %> + <% end %> From 311eb07a400d1bbe05e17331dea33396fb959af5 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 25 Nov 2013 11:36:50 -0800 Subject: [PATCH 090/107] Adding js for ajax request on updating feedback --- app/views/deliverables/update_feedback.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/deliverables/update_feedback.js.erb b/app/views/deliverables/update_feedback.js.erb index e56d06b71..257957d68 100644 --- a/app/views/deliverables/update_feedback.js.erb +++ b/app/views/deliverables/update_feedback.js.erb @@ -1,2 +1,2 @@ $("#grading_queue").detach(); -$("#deliverables").append($("<%= escape_javascript(render partial: 'deliverable_listing_professor', :locals => {:deliverables => @deliverables, :skip_course_column => true}) %>")) \ No newline at end of file +$("#deliverables").append($("<%= escape_javascript(render partial: 'deliverables/deliverable_listing_professor', :locals => {:deliverables => @deliverables, :skip_course_column => true}) %>")) \ No newline at end of file From 4daf341658554261b3abdb0388b45f894a4e8120 Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Mon, 25 Nov 2013 13:13:31 -0800 Subject: [PATCH 091/107] New style for Grade Book buttons/import/export sections --- app/views/grades/index.html.erb | 81 +++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/app/views/grades/index.html.erb b/app/views/grades/index.html.erb index b0faf8765..8ef116a57 100644 --- a/app/views/grades/index.html.erb +++ b/app/views/grades/index.html.erb @@ -179,7 +179,7 @@
-
+
/> @@ -215,44 +215,55 @@ <%= render :partial => "grade_spreadsheet", :locals => {:hide_draft_grades => false, :assignments => @assignments, :course => @course, :grades => @grades, :team_assignment => @team_assignment} %> - - - - <%= link_to image_tag("/images/ajax-loader.gif", :class => "loading", :alt => "Loading" ,:hidden=>"true", :id=>"loading") %> - Send a copy to myself - - - - - - - -
-
- -
- -
- - - -
+
+ +
Please save changes
+ +
+
+ + <%= link_to image_tag("/images/ajax-loader.gif", :class => "loading", :alt => "Loading", :hidden => true, :id => "loading") %>
+
-
Please save changes
+
+ +
+
+ Send a copy to myself +
+
+ +
+
+ +
+ +
-
-

Import Grade Book

- <%= form_for :import, :url=>{:controller=>"grades", :action=>"import"}, :html => { :multipart => true } do |f| %> - <%= f.file_field :spreadsheet -%> - <%= submit_tag 'Import' %> - <% end %> +
+ +
+
+
+

Import Grade Book

+ <%= form_for :import, :url=>{:controller=>"grades", :action=>"import"}, :html => { :multipart => true } do |f| %> + <%= f.file_field :spreadsheet -%>
+ <%= submit_tag 'Import', class: "btn btn-default" %> + <% end %> +
-
-

Export Grade Book

- <%= form_for :export, :url=>{:controller=>"grades", :action=>"export"} do |f| %> - <%= submit_tag 'Export' %> - <% end %> +
+ +
+
+
+

Export Grade Book

+ <%= form_for :export, :url=>{:controller=>"grades", :action=>"export"} do |f| %> + <%= submit_tag 'Export', class: "btn btn-default" %> + <% end %> +
+
From 05e30726d9fd2794223c153f20ebb8b362e6a390 Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Mon, 25 Nov 2013 19:08:20 -0800 Subject: [PATCH 092/107] Modify Deliverable Controller: Show everything when no filter options is selected --- app/controllers/deliverables_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index cba360d07..c4c9aed33 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -90,9 +90,13 @@ def get_deliverables @deliverables = [] - # Filter according to the selected grading options - @selected_options.each do |option| - @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + # Filter according to the selected grading options. If no filter options are selected, display every deliverables + if @selected_options.size == 0 + @deliverables = @faculty_deliverables + else + @selected_options.each do |option| + @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option }) + end end # Filter by assignment names in drop down menu From e91f1eb52d1990d74a3c5503fa03294efe4e9581 Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Mon, 25 Nov 2013 19:09:04 -0800 Subject: [PATCH 093/107] Adding filtering by assignment when updating feedback --- app/controllers/deliverables_controller.rb | 8 ++++---- app/views/deliverables/_edit_student_feedback.html.erb | 3 ++- app/views/deliverables/grading_queue_for_course.html.erb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index cba360d07..39ef88539 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -447,10 +447,10 @@ def update_feedback @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option }) end - ## Filter by assignment names in drop down menu - #unless params[:filter_options][:assignment_id].empty? or params[:filter_options][:assignment_id] == '-1' - # @deliverables = @deliverables.select{ |deliverable| deliverable.assignment_id == params[:filter_options][:assignment_id].to_i } - #end + # Filter by assignment names in drop down menu + unless @selected_filter_options['assignment_id'] == '-1' + @deliverables = @deliverables.select{ |deliverable| deliverable.assignment_id == @selected_filter_options['assignment_id'].to_i } + end # Sort by task number, ascending @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index 3d7d84744..2bd344239 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -25,7 +25,8 @@ "ungraded": ($('#filter_options_ungraded').is(':checked') ? '1' : ''), "graded" : ($('#filter_options_graded').is(':checked') ? '1' : ''), "drafted": ($('#filter_options_drafted').is(':checked') ? '1' : ''), - "is_my_teams" : ($('#filter_options_is_my_teams_yes').is(':checked') ? 'yes' : '') + "is_my_teams" : ($('#filter_options_is_my_teams_yes').is(':checked') ? 'yes' : ''), + "assignment_id" : $("#filter_options_assignment_id").val() } $("#deliverable_current_filter_options").val(''); $("#deliverable_current_filter_options").val(JSON.stringify(current_filter_options)); diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index d5013b428..cfe94d1f9 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -212,7 +212,7 @@ <%= f.check_box :graded %> Graded - <%= f.hidden_field :assignment_id, { value: '' } %> + <%= f.hidden_field :assignment_id, { value: '-1' } %>
From bc7737f085d65b28b5fbc9c9162a5d8aa6ac0aab Mon Sep 17 00:00:00 2001 From: Maria Emilia Torino Date: Wed, 27 Nov 2013 10:21:28 -0800 Subject: [PATCH 102/107] Applying Tushar's fix to reminder hanlder tests --- config/environments/test.rb | 2 ++ spec/lib/reminder_handler_spec.rb | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index f0800d60a..3e859e7c6 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -32,6 +32,8 @@ # Print deprecation notices to the stderr config.active_support.deprecation = :stderr + + config.time_zone = "UTC" # This next line was left over from rails2 code, do we still need it? # config.gem 'rspec-rails', :version => '>= 1.3.2', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) diff --git a/spec/lib/reminder_handler_spec.rb b/spec/lib/reminder_handler_spec.rb index 375b136d8..ac78385ec 100644 --- a/spec/lib/reminder_handler_spec.rb +++ b/spec/lib/reminder_handler_spec.rb @@ -8,11 +8,15 @@ before :each do @current_time = Time.now @user = FactoryGirl.build_stubbed(:faculty_frank_user) + # While storing to Active Record, use current_time.utc as Active record + # assumes pacific time (config/application.rb) but stores as utc + # internally. Causing the test case to fail. + # Time zone overriden in (config/environments/test.rb) @page1 = FactoryGirl.build_stubbed(:ppm, updated_by_user_id: @user.id, - updated_at: @current_time - 1.year) + updated_at: @current_time.utc - 1.year) @page2 = FactoryGirl.build_stubbed(:ppm, url: "page2", updated_by_user_id: @user.id, - updated_at: @current_time - 13.months) + updated_at: @current_time.utc - 13.months) Page.stub(:all).and_return([@page1, @page2]) @page1.stub(:updated_by).and_return(@user) @page2.stub(:updated_by).and_return(@user) @@ -43,4 +47,4 @@ end end -end \ No newline at end of file +end From 4c75ab9ca3077d62eea64622f1efe0d4653a8b93 Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Sun, 1 Dec 2013 17:44:56 -0800 Subject: [PATCH 103/107] Implement test cases for searching deliverables --- app/controllers/deliverables_controller.rb | 14 +++-- app/models/deliverable.rb | 57 +---------------- .../grading_queue_for_course.html.erb | 1 - .../deliverables_controller_spec.rb | 37 +++++++++++ spec/factories/deliverables.rb | 8 +++ spec/factories/team_assignment.rb | 25 +++++--- spec/factories/teams.rb | 13 +++- spec/models/deliverable_model_spec.rb | 61 ++++++++++++++++--- 8 files changed, 140 insertions(+), 76 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index c26676e8a..1dbcd4364 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -36,8 +36,8 @@ def grading_queue_for_course elsif @course.faculty.include?(current_user) - # Get all deliverables for this team/student or all students - @deliverables = Deliverable.grading_queue_display(params[:course_id], current_user.id) + # Get all deliverables for this team/student + @deliverables = Deliverable.get_deliverables(params[:course_id], current_user.id, {:is_my_team => 1}) # Select all that are ungraded or drafted @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded || deliverable.get_grade_status == :drafted } @@ -51,13 +51,14 @@ def grading_queue_for_course end + # Beg Team Turing def get_deliverables @deliverables = filter_deliverables(params[:course_id], params[:filter_options]) respond_to do |format| format.js end - end + # End Team Turing #temporary for mel def team_index_for_course @@ -357,10 +358,13 @@ def get_assignments_for_student end end + + # Beg Team Turing private def filter_deliverables (course_id, filter_options) @course = Course.find_by_id(course_id) + # Prepare filter options accorging to what users select on the page options = {} if filter_options[:search_box] != "" options[:search_string] = filter_options[:search_box] @@ -373,7 +377,7 @@ def filter_deliverables (course_id, filter_options) end - #Filter in the model by course, professor, my teams and search input + # Filter in the model by course, professor, my teams and search input @deliverables = [] @faculty_deliverables = Deliverable.get_deliverables(course_id, current_user.id, options) @@ -398,5 +402,7 @@ def filter_deliverables (course_id, filter_options) # Sort by task number, ascending @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number } end + # End Team Turing + end diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index f790738c0..9fa87988c 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -57,8 +57,8 @@ class Deliverable < ActiveRecord::Base after_save :inaccurate_course_and_assignment_check - - def self.get_deliverables(course_id, faculty_id, options = nil) + # Begin Team Turing + def self.get_deliverables(course_id, faculty_id, options) sql_template = "SELECT d.id FROM deliverables d LEFT JOIN teams t ON d.team_id = t.id LEFT JOIN team_assignments ta ON t.id = ta.team_id LEFT JOIN users u1 ON d.creator_id = u1.id LEFT JOIN users u2 ON ta.user_id = u2.id" @@ -72,9 +72,6 @@ def self.get_deliverables(course_id, faculty_id, options = nil) queue = [] - # Test setup - #options = {:is_my_team => 1, :search_string => "David"} - # 1. Are there teams in this course? If there are, and the "filter by teams is on", filter by teams # 2. If there are no teams in the course, and if this deliverable is an individual deliverable, # show deliverables for individuals who are in the faculty's teams only. @@ -146,55 +143,7 @@ def self.get_deliverables(course_id, faculty_id, options = nil) return deliverables end - - - def self.grading_queue_display(course_id, faculty_id, options = nil) - - # Default grading queue filters - options = { "is_my_teams" => 1 } if options.nil? - - queue = [] - - # 1. Are there teams in this course? If there are, and the "filter by teams is on", filter by teams - # 2. If there are no teams in the course, and if this deliverable is an individual deliverable, - # show deliverables for individuals who are in the faculty's teams only. - # 3. Otherwise, show every deliverable - - course_has_teams = Team.where(:course_id => course_id).first - - if course_has_teams.nil? - - queue = Deliverable.where(:course_id => course_id).all - - else # The course has teams - # By default, the faculty see their teams or individuals in their teams with ungraded deliverables - if options['is_my_teams'] == 1 - - queue = Deliverable.joins(:team).where(:course_id => course_id, "teams.primary_faculty_id" => faculty_id).all - - # This course may have teams, but this deliverable may not be a team deliverable. In that case: - sql = "SELECT * FROM deliverables d WHERE course_id = ? AND creator_id IN ( - SELECT ta.user_id FROM teams t - INNER JOIN team_assignments ta ON t.id = ta.team_id - WHERE t.primary_faculty_id = ? AND d.team_id IS NULL)" # team_id in deliverable is null when it's an individual deliverable - - results = Deliverable.find_by_sql([sql, course_id, faculty_id]) - - results.each do |result| - queue << result - end - - else # Do not filter by my teams, show every deliverable - - queue = Deliverable.where(:course_id => course_id).all - - end # end 'Filter by my teams' - - end # end 'Course has teams ' - - return queue - - end + # End Team Turing # To get the owner of the deliverable def unique_course_task_owner? diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 8b995576c..1a1f7c907 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -145,7 +145,6 @@ $('#filter_options_new').submit(); }; - // TODO David will implement the search box keyup listener $('#search_box').keyup(function(){ $('#filter_options_new').submit(); }); diff --git a/spec/controllers/deliverables_controller_spec.rb b/spec/controllers/deliverables_controller_spec.rb index f1ec6f2e6..781cf1a25 100644 --- a/spec/controllers/deliverables_controller_spec.rb +++ b/spec/controllers/deliverables_controller_spec.rb @@ -154,6 +154,43 @@ end + + context "search function is enabled" do + + before do + + @team_member = FactoryGirl.create(:team_member) + + @team_ruby_racer = FactoryGirl.create(:team_ruby_racer, :course=>@course) + + @team_ruby_racer.members = [@team_member] + + @ruby_racer_grade_graded = FactoryGirl.create(:grade_visible, :course => @course, :student =>@team_member, :assignment => @assignment_graded) + @ruby_racer_grade_drafted = FactoryGirl.create(:grade_invisible, :course => @course, :student => @team_member, :assignment => @assignment_drafted) + @ruby_racer_grade_ungraded = nil + + @deliverable_ruby_racer_ungraded = FactoryGirl.create(:team_ruby_racer_deliverable_1,:course => @course, :team => @team_ruby_racer,:assignment => @assignment_ungraded, :creator => @team_member) + @deliverable_ruby_racer_drafted = FactoryGirl.create(:team_ruby_racer_deliverable_1,:course => @course, :team => @team_ruby_racer,:assignment => @assignment_drafted, :creator => @team_member) + @deliverable_ruby_racer_graded = FactoryGirl.create(:team_ruby_racer_deliverable_1,:course => @course, :team => @team_ruby_racer,:assignment => @assignment_graded, :creator => @team_member) + + @da_ruby_racer_ungraded = FactoryGirl.create(:attachment_1, :deliverable => @deliverable_ruby_racer_ungraded, :submitter => @team_member) + @da_ruby_racer_drafted = FactoryGirl.create(:attachment_1, :deliverable => @deliverable_ruby_racer_drafted, :submitter => @team_member) + @da_ruby_racer_graded = FactoryGirl.create(:attachment_1, :deliverable => @deliverable_ruby_racer_graded, :submitter => @team_member) + + end + + + it 'shows all deliverables of only my teams and search box is entered' do + get :get_deliverables, :filter_options => {:assignment_id => "-1", :is_my_teams => 'yes', :search_box => "Member"}, :course_id => @course.id + + @expected_deliverable = assigns(:deliverables) + @expected_deliverable.should have(3).items + @expected_deliverable[0].should == @deliverable_ruby_racer_ungraded + @expected_deliverable[1].should == @deliverable_ruby_racer_graded + @expected_deliverable[2].should == @deliverable_ruby_racer_drafted + + end + end ## end add Team turing end diff --git a/spec/factories/deliverables.rb b/spec/factories/deliverables.rb index 37e1f52ce..28bdf9deb 100644 --- a/spec/factories/deliverables.rb +++ b/spec/factories/deliverables.rb @@ -48,6 +48,14 @@ association :creator, :factory => :student_sally_user association :course, :factory => :fse end + + factory :team_ruby_racer_deliverable_1, :parent => :deliverable do + association :assignment, :factory => :assignment + association :team, :factory => :team_ruby_racer + association :course, :factory => :fse + private_note "Ruby Racer's first deliverable" + end + ## end add turing end diff --git a/spec/factories/team_assignment.rb b/spec/factories/team_assignment.rb index 03114d68a..75aa9a4ee 100644 --- a/spec/factories/team_assignment.rb +++ b/spec/factories/team_assignment.rb @@ -1,13 +1,20 @@ +#Beg Team Turing FactoryGirl.define do -factory :team_turing_assignment, class: TeamAssignment do - association :team, :factory => :team_turing - association :user, :factory => :student_sam_user -end + factory :team_turing_assignment, class: TeamAssignment do + association :team, :factory => :team_turing + association :user, :factory => :student_sam_user + end -factory :team_test_assignment, class: TeamAssignment do - association :team, :factory => :team_test - association :user, :factory => :student_john_user -end + factory :team_test_assignment, class: TeamAssignment do + association :team, :factory => :team_test + association :user, :factory => :student_john_user + end -end \ No newline at end of file + factory :team_ruby_racer_assignment, class: TeamAssignment do + association :team, :factory => :team_ruby_racer + association :user, :factory => :student_sally_user + end + +end +#End Team Turing \ No newline at end of file diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb index cfd8e386e..1bd26e4d0 100644 --- a/spec/factories/teams.rb +++ b/spec/factories/teams.rb @@ -35,7 +35,6 @@ end - factory :team_test, class: Team do name "Test" email "test@sv.cmu.edu" @@ -47,5 +46,17 @@ association :course, :factory => :fse end + factory :team_ruby_racer, class: Team do + name "Ruby Racer" + email "ruby_racer@sv.cmu.edu" + primary_faculty_id 46 + updating_email false + tigris_space "http://team.turing.org/servlets/ProjectDocumentList" + twiki_space "http://info.sv.cmu.edu/twiki/bin/view/Graffiti/WebHome" + + association :course, :factory => :fse + + end + ## end add turing end \ No newline at end of file diff --git a/spec/models/deliverable_model_spec.rb b/spec/models/deliverable_model_spec.rb index 52a5ecc37..49d50670b 100644 --- a/spec/models/deliverable_model_spec.rb +++ b/spec/models/deliverable_model_spec.rb @@ -192,6 +192,7 @@ end end + # Beg Team Turing context "for a professor" do before (:each) do @faculty_frank = FactoryGirl.build(:faculty_frank_user) @@ -199,6 +200,7 @@ @course_ise = FactoryGirl.create(:ise, faculty: [@faculty_frank]) @student_sam = FactoryGirl.create(:student_sam) @student_sally = FactoryGirl.create(:student_sally) + @team_member = FactoryGirl.create(:team_member) end it "Displays the professor's teams deliverables if the professor has at least one team" do @@ -217,7 +219,9 @@ @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sam) @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sam) - @deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + @options = {:is_my_team => 1} + + @deliverables = Deliverable.get_deliverables(@course_fse.id, @faculty_frank.id, @options) @deliverables.should have(2).items @deliverables[0].should == @deliverable2 @@ -244,7 +248,9 @@ @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sally) #@dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sam) - @deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + @options = {:is_my_team => 1} + + @deliverables = Deliverable.get_deliverables(@course_fse.id, @faculty_frank.id, @options) @deliverables.should have(1).items @deliverables[0].should == @deliverable1 @@ -275,29 +281,70 @@ @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sam) @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sally) - @deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + @options = {:is_my_team => 1} + @deliverables = Deliverable.get_deliverables(@course_fse.id, @faculty_frank.id, @options) @deliverables.should have(2).items @deliverables[0].should == @deliverable1 @deliverables[1].should == @deliverable2 - - end it "Displays all deliverables if the course does not have teams" do @deliverable1 = FactoryGirl.create(:turing_individual_deliverable, :course=>@course_fse) -# @deliverable2 = FactoryGirl.create(:individual_deliverable, :course=>@course_ise) + #@deliverable2 = FactoryGirl.create(:individual_deliverable, :course=>@course_ise) @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) - @deliverables = Deliverable.grading_queue_display(@course_fse.id, @faculty_frank.id) + @options = {:is_my_team => 1} + @deliverables = Deliverable.get_deliverables(@course_fse.id, @faculty_frank.id, @options) @deliverables.should have(1).items @deliverables[0].should == @deliverable1 end + it "If a course has teams and user enter search terms, display team deliverables as well as individual deliverables + for students in the faculty's team" do + + @team_turing = FactoryGirl.create(:team_turing, :course=>@course_fse) + @team_test = FactoryGirl.create(:team_test, :course=>@course_fse) + @team_ruby_racer = FactoryGirl.create(:team_ruby_racer, :course=>@course_fse) + + @team_assignment = FactoryGirl.create(:team_turing_assignment, :team => @team_turing, :user => @student_sam) + @team_assignment = FactoryGirl.create(:team_test_assignment, :team => @team_test, :user => @student_sally) + @team_assignment = FactoryGirl.create(:team_ruby_racer_assignment, :team => @team_ruby_racer, :user => @team_member) + + @assignment1 = FactoryGirl.create(:assignment_3,:course => @course_fse) + @assignment2 = FactoryGirl.create(:assignment_3,:course => @course_fse) + + # Team deliverable + @deliverable1 = FactoryGirl.create(:team_turing_deliverable_1,:course => @course_fse, :team => @team_turing,:assignment => @assignment1, :creator => @student_sam) + # Individual deliverable 1 + @deliverable2 = FactoryGirl.create(:turing_individual_deliverable,:course => @course_fse, :assignment => @assignment1, :creator => @student_sam) + # Individual deliverable 2 + @deliverable3 = FactoryGirl.create(:test_individual_deliverable,:course => @course_fse, :assignment => @assignment2, :creator => @student_sally) + # Team deliverable of team Ruby Racer + @deliverable4 = FactoryGirl.create(:team_ruby_racer_deliverable_1,:course => @course_fse, :team => @team_ruby_racer,:assignment => @assignment1, :creator => @team_member) + # Individual deliverable 3 + @deliverable5 = FactoryGirl.create(:test_individual_deliverable,:course => @course_fse, :assignment => @assignment2, :creator => @team_member) + + @dav1 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable1, :submitter => @student_sam) + @dav2 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable2, :submitter => @student_sam) + @dav3 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable3, :submitter => @student_sally) + @dav4 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable4, :submitter => @team_member) + @dav5 = FactoryGirl.create(:attachment_1, :deliverable => @deliverable5, :submitter => @team_member) + + @options = {:is_my_team => 1, :search_string => "Member"} + @deliverables = Deliverable.get_deliverables(@course_fse.id, @faculty_frank.id, @options) + @deliverables.should have(2).items + + @deliverables[0].should == @deliverable4 + @deliverables[1].should == @deliverable5 + + end + end + # End Team Turing #Beg add Turing Ira context " for a individual deliverable last graded by" do From 7482b74468bda8e1ccd275a13aaffb2b659e6c7d Mon Sep 17 00:00:00 2001 From: Isil Demir Date: Tue, 3 Dec 2013 16:51:02 -0800 Subject: [PATCH 104/107] Fixed the problem of Bootstrap CSS breaking the entire website --- .../_edit_student_feedback.html.erb | 14 +- .../grading_queue_for_course.html.erb | 43 +- app/views/deliverables/show.html.erb | 12 +- app/views/grades/index.html.erb | 85 +- app/views/layouts/cmu_sv.html.erb | 3 +- public/stylesheets/tw-bs.css | 5851 +++++++++++++++++ 6 files changed, 5916 insertions(+), 92 deletions(-) create mode 100644 public/stylesheets/tw-bs.css diff --git a/app/views/deliverables/_edit_student_feedback.html.erb b/app/views/deliverables/_edit_student_feedback.html.erb index 2bd344239..03368e25f 100755 --- a/app/views/deliverables/_edit_student_feedback.html.erb +++ b/app/views/deliverables/_edit_student_feedback.html.erb @@ -34,12 +34,6 @@ // Team Turing Begin var toggle_slide = function() { - - //$('#deliverable_submit_draft').parent().parent().parent().parent().slideToggle(); - //$('#deliverable_submit_draft').('.deliverable_detail').slideUp(); - //$('#deliverable_submit_draft').closest('.deliverable_detail').slideToggle(); - //$('#deliverable_submit_draft').('.deliverable_detail').siblings().slideUp(); - //$('#deliverable_submit_draft').parents('.deliverable_detail').slideUp(); $('.deliverable_detail').slideUp(); }; @@ -136,17 +130,17 @@ <%= f.label :feedback_comment, "Feedback Comments" %> <%= link_to 'View History and Feedback', @deliverable %>
- <%= f.text_area :feedback_comment, :size => "95x10" %> + <%= f.text_area :feedback_comment, :size => "85x10" %>
-

<%= professor_image %> Professor's Notes - Only faculty can see this information

+

<%= professor_image %> Professor's Notes + Only faculty can see this information

- <%= f.text_area :private_note, :size => "90x10" %> + <%= f.text_area :private_note, :size => "80x10" %>

diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 8b995576c..7985f87f6 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -1,18 +1,8 @@

<%= @course.display_for_course_page %>

<%= render :partial=>"layouts/grade_book_sub_menu" %> - - +
- -
<%= javascript_include_tag 'jquery.tablesorter.min.js' %> <%= javascript_include_tag 'jquery.quicksearch.js' %> <%= javascript_include_tag 'jquery.session' %> @@ -145,7 +135,6 @@ $('#filter_options_new').submit(); }; - // TODO David will implement the search box keyup listener $('#search_box').keyup(function(){ $('#filter_options_new').submit(); }); @@ -153,30 +142,9 @@ - - - - - - +
- @@ -190,7 +158,7 @@
-
+
@@ -214,7 +182,7 @@ All Deliverables -
    +
    • All Deliverables
      • <% @assignments.each do |assignment| %>
    • @@ -252,4 +220,5 @@
      <%= render :partial => "deliverable_listing_professor", :locals => {:deliverables => @deliverables, :skip_course_column => true} %>
      -
+ +
diff --git a/app/views/deliverables/show.html.erb b/app/views/deliverables/show.html.erb index b3185ef91..49d1264d7 100755 --- a/app/views/deliverables/show.html.erb +++ b/app/views/deliverables/show.html.erb @@ -9,11 +9,15 @@ font-family: Helvetica, Arial, sans-serif; font-weight: 500; line-height: 1.1; + margin-top: 13px; } .columnless table td { border-right: none; border-left: none; } + .columnless table td a:visited { + color:white; + } @@ -43,7 +47,7 @@
-
+
@@ -75,14 +79,14 @@ <%= display_timestamp(version.submission_date) -%> <% end %> <%if !@deliverable.assignment_due_date.nil? && version.submission_date > @deliverable.assignment_due_date %> - <%= distance_of_time_in_words(version.submission_date, @deliverable.assignment_due_date)%> late! + <%= distance_of_time_in_words(version.submission_date, @deliverable.assignment_due_date)%> late! <%end%>
<%= h version.comment -%> - + <% unless version.attachment_file_name.nil? %> - <%= link_to 'Download', version.attachment.url %> + <%= link_to('Download', version.attachment.url, :class => 'btn btn-xs btn-primary') %> <% end %> diff --git a/app/views/grades/index.html.erb b/app/views/grades/index.html.erb index 8ef116a57..456f3bfcf 100644 --- a/app/views/grades/index.html.erb +++ b/app/views/grades/index.html.erb @@ -219,51 +219,56 @@
-
Please save changes
- -
-
- - <%= link_to image_tag("/images/ajax-loader.gif", :class => "loading", :alt => "Loading", :hidden => true, :id => "loading") %> -
-
+ +
-
- -
-
- Send a copy to myself -
-
- -
-
- -
+
Please save changes
+ +
+
+ + <%= link_to image_tag("/images/ajax-loader.gif", :class => "loading", :alt => "Loading", :hidden => true, :id => "loading") %> +
+
-
+
+ +
+
+ Send a copy to myself +
+
+ +
+
+ +
-
+
+ +
-
-
-
-

Import Grade Book

- <%= form_for :import, :url=>{:controller=>"grades", :action=>"import"}, :html => { :multipart => true } do |f| %> - <%= f.file_field :spreadsheet -%>
- <%= submit_tag 'Import', class: "btn btn-default" %> - <% end %> +
+
+
+

Import Grade Book

+ <%= form_for :import, :url=>{:controller=>"grades", :action=>"import"}, :html => { :multipart => true } do |f| %> + <%= f.file_field :spreadsheet -%>
+ <%= submit_tag 'Import', class: "btn btn-default" %> + <% end %> +
+
-
-
-
-
-
-

Export Grade Book

- <%= form_for :export, :url=>{:controller=>"grades", :action=>"export"} do |f| %> - <%= submit_tag 'Export', class: "btn btn-default" %> - <% end %> +
+
+
+

Export Grade Book

+ <%= form_for :export, :url=>{:controller=>"grades", :action=>"export"} do |f| %> + <%= submit_tag 'Export', class: "btn btn-default" %> + <% end %> +
+
-
+
diff --git a/app/views/layouts/cmu_sv.html.erb b/app/views/layouts/cmu_sv.html.erb index e4568aa49..1321e63bf 100644 --- a/app/views/layouts/cmu_sv.html.erb +++ b/app/views/layouts/cmu_sv.html.erb @@ -34,7 +34,8 @@ <%= yield :head %> - <%= stylesheet_link_tag "/stylesheets/bootstrap.min.css", :media => "screen", :rel => "stylesheet" %> + <%#= stylesheet_link_tag "/stylesheets/bootstrap.min.css", :media => "screen", :rel => "stylesheet" %> + <%= stylesheet_link_tag "/stylesheets/tw-bs.css", :media => "screen", :rel => "stylesheet" %> <%= javascript_include_tag 'bootstrap.min.js' %> diff --git a/public/stylesheets/tw-bs.css b/public/stylesheets/tw-bs.css new file mode 100644 index 000000000..b37011e11 --- /dev/null +++ b/public/stylesheets/tw-bs.css @@ -0,0 +1,5851 @@ +.tw-bs { + /*! + * Bootstrap v3.0.0 + * + * Copyright 2013 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + */ + /*! normalize.css v2.1.0 | MIT License | git.io/normalize */ +} +.tw-bs article, +.tw-bs aside, +.tw-bs details, +.tw-bs figcaption, +.tw-bs figure, +.tw-bs footer, +.tw-bs header, +.tw-bs hgroup, +.tw-bs main, +.tw-bs nav, +.tw-bs section, +.tw-bs summary { + display: block; +} +.tw-bs audio, +.tw-bs canvas, +.tw-bs video { + display: inline-block; +} +.tw-bs audio:not([controls]) { + display: none; + height: 0; +} +.tw-bs [hidden] { + display: none; +} +.tw-bs html { + font-family: sans-serif; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +.tw-bs body { + margin: 0; +} +.tw-bs a:focus { + outline: thin dotted; +} +.tw-bs a:active, +.tw-bs a:hover { + outline: 0; +} +.tw-bs h1 { + font-size: 2em; + margin: 0.67em 0; +} +.tw-bs abbr[title] { + border-bottom: 1px dotted; +} +.tw-bs b, +.tw-bs strong { + font-weight: bold; +} +.tw-bs dfn { + font-style: italic; +} +.tw-bs hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} +.tw-bs mark { + background: #ff0; + color: #000; +} +.tw-bs code, +.tw-bs kbd, +.tw-bs pre, +.tw-bs samp { + font-family: monospace, serif; + font-size: 1em; +} +.tw-bs pre { + white-space: pre-wrap; +} +.tw-bs q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} +.tw-bs small { + font-size: 80%; +} +.tw-bs sub, +.tw-bs sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +.tw-bs sup { + top: -0.5em; +} +.tw-bs sub { + bottom: -0.25em; +} +.tw-bs img { + border: 0; +} +.tw-bs svg:not(:root) { + overflow: hidden; +} +.tw-bs figure { + margin: 0; +} +.tw-bs fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} +.tw-bs legend { + border: 0; + padding: 0; +} +.tw-bs button, +.tw-bs input, +.tw-bs select, +.tw-bs textarea { + font-family: inherit; + font-size: 100%; + margin: 0; +} +.tw-bs button, +.tw-bs input { + line-height: normal; +} +.tw-bs button, +.tw-bs select { + text-transform: none; +} +.tw-bs button, +.tw-bs html input[type="button"], +.tw-bs input[type="reset"], +.tw-bs input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +.tw-bs button[disabled], +.tw-bs html input[disabled] { + cursor: default; +} +.tw-bs input[type="checkbox"], +.tw-bs input[type="radio"] { + box-sizing: border-box; + padding: 0; +} +.tw-bs input[type="search"] { + -webkit-appearance: textfield; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + box-sizing: content-box; +} +.tw-bs input[type="search"]::-webkit-search-cancel-button, +.tw-bs input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +.tw-bs button::-moz-focus-inner, +.tw-bs input::-moz-focus-inner { + border: 0; + padding: 0; +} +.tw-bs textarea { + overflow: auto; + vertical-align: top; +} +.tw-bs table { + border-collapse: collapse; + border-spacing: 0; +} +@media print { + .tw-bs * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + .tw-bs a, + .tw-bs a:visited { + text-decoration: underline; + } + .tw-bs a[href]:after { + content: " (" attr(href) ")"; + } + .tw-bs abbr[title]:after { + content: " (" attr(title) ")"; + } + .tw-bs .ir a:after, + .tw-bs a[href^="javascript:"]:after, + .tw-bs a[href^="#"]:after { + content: ""; + } + .tw-bs pre, + .tw-bs blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + .tw-bs thead { + display: table-header-group; + } + .tw-bs tr, + .tw-bs img { + page-break-inside: avoid; + } + .tw-bs img { + max-width: 100% !important; + } + @page { + margin: 2cm .5cm; + } + .tw-bs p, + .tw-bs h2, + .tw-bs h3 { + orphans: 3; + widows: 3; + } + .tw-bs h2, + .tw-bs h3 { + page-break-after: avoid; + } + .tw-bs .navbar { + display: none; + } + .tw-bs .table td, + .tw-bs .table th { + background-color: #fff !important; + } + .tw-bs .btn > .caret, + .tw-bs .dropup > .btn > .caret { + border-top-color: #000 !important; + } + .tw-bs .label { + border: 1px solid #000; + } + .tw-bs .table { + border-collapse: collapse !important; + } + .tw-bs .table-bordered th, + .tw-bs .table-bordered td { + border: 1px solid #ddd !important; + } +} +.tw-bs *, +.tw-bs *:before, +.tw-bs *:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.tw-bs html { + font-size: 62.5%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} +.tw-bs body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.428571429; + color: #333333; + background-color: #ffffff; +} +.tw-bs input, +.tw-bs button, +.tw-bs select, +.tw-bs textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +.tw-bs button, +.tw-bs input, +.tw-bs select[multiple], +.tw-bs textarea { + background-image: none; +} +.tw-bs a { + color: #428bca; + text-decoration: none; +} +.tw-bs a:hover, +.tw-bs a:focus { + color: #2a6496; + text-decoration: underline; +} +.tw-bs a:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.tw-bs img { + vertical-align: middle; +} +.tw-bs .img-responsive { + display: block; + max-width: 100%; + height: auto; +} +.tw-bs .img-rounded { + border-radius: 6px; +} +.tw-bs .img-thumbnail { + padding: 4px; + line-height: 1.428571429; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; +} +.tw-bs .img-circle { + border-radius: 50%; +} +.tw-bs hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #eeeeee; +} +.tw-bs .sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} +.tw-bs p { + margin: 0 0 10px; +} +.tw-bs .lead { + margin-bottom: 20px; + font-size: 16.099999999999998px; + font-weight: 200; + line-height: 1.4; +} +@media (min-width: 768px) { + .tw-bs .lead { + font-size: 21px; + } +} +.tw-bs small { + font-size: 85%; +} +.tw-bs cite { + font-style: normal; +} +.tw-bs .text-muted { + color: #999999; +} +.tw-bs .text-primary { + color: #428bca; +} +.tw-bs .text-warning { + color: #c09853; +} +.tw-bs .text-danger { + color: #b94a48; +} +.tw-bs .text-success { + color: #468847; +} +.tw-bs .text-info { + color: #3a87ad; +} +.tw-bs .text-left { + text-align: left; +} +.tw-bs .text-right { + text-align: right; +} +.tw-bs .text-center { + text-align: center; +} +.tw-bs h1, +.tw-bs h2, +.tw-bs h3, +.tw-bs h4, +.tw-bs h5, +.tw-bs h6, +.tw-bs .h1, +.tw-bs .h2, +.tw-bs .h3, +.tw-bs .h4, +.tw-bs .h5, +.tw-bs .h6 { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: 500; + line-height: 1.1; +} +.tw-bs h1 small, +.tw-bs h2 small, +.tw-bs h3 small, +.tw-bs h4 small, +.tw-bs h5 small, +.tw-bs h6 small, +.tw-bs .h1 small, +.tw-bs .h2 small, +.tw-bs .h3 small, +.tw-bs .h4 small, +.tw-bs .h5 small, +.tw-bs .h6 small { + font-weight: normal; + line-height: 1; + color: #999999; +} +.tw-bs h1, +.tw-bs h2, +.tw-bs h3 { + margin-top: 20px; + margin-bottom: 10px; +} +.tw-bs h4, +.tw-bs h5, +.tw-bs h6 { + margin-top: 10px; + margin-bottom: 10px; +} +.tw-bs h1, +.tw-bs .h1 { + font-size: 36px; +} +.tw-bs h2, +.tw-bs .h2 { + font-size: 30px; +} +.tw-bs h3, +.tw-bs .h3 { + font-size: 24px; +} +.tw-bs h4, +.tw-bs .h4 { + font-size: 18px; +} +.tw-bs h5, +.tw-bs .h5 { + font-size: 14px; +} +.tw-bs h6, +.tw-bs .h6 { + font-size: 12px; +} +.tw-bs h1 small, +.tw-bs .h1 small { + font-size: 24px; +} +.tw-bs h2 small, +.tw-bs .h2 small { + font-size: 18px; +} +.tw-bs h3 small, +.tw-bs .h3 small, +.tw-bs h4 small, +.tw-bs .h4 small { + font-size: 14px; +} +.tw-bs .page-header { + padding-bottom: 9px; + margin: 40px 0 20px; + border-bottom: 1px solid #eeeeee; +} +.tw-bs ul, +.tw-bs ol { + margin-top: 0; + margin-bottom: 10px; +} +.tw-bs ul ul, +.tw-bs ol ul, +.tw-bs ul ol, +.tw-bs ol ol { + margin-bottom: 0; +} +.tw-bs .list-unstyled { + padding-left: 0; + list-style: none; +} +.tw-bs .list-inline { + padding-left: 0; + list-style: none; +} +.tw-bs .list-inline > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; +} +.tw-bs dl { + margin-bottom: 20px; +} +.tw-bs dt, +.tw-bs dd { + line-height: 1.428571429; +} +.tw-bs dt { + font-weight: bold; +} +.tw-bs dd { + margin-left: 0; +} +@media (min-width: 768px) { + .tw-bs .dl-horizontal dt { + float: left; + width: 160px; + clear: left; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .tw-bs .dl-horizontal dd { + margin-left: 180px; + } + .tw-bs .dl-horizontal dd:before, + .tw-bs .dl-horizontal dd:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ + } + .tw-bs .dl-horizontal dd:after { + clear: both; + } + .tw-bs .dl-horizontal dd:before, + .tw-bs .dl-horizontal dd:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ + } + .tw-bs .dl-horizontal dd:after { + clear: both; + } +} +.tw-bs abbr[title], +.tw-bs abbr[data-original-title] { + cursor: help; + border-bottom: 1px dotted #999999; +} +.tw-bs abbr.initialism { + font-size: 90%; + text-transform: uppercase; +} +.tw-bs blockquote { + padding: 10px 20px; + margin: 0 0 20px; + border-left: 5px solid #eeeeee; +} +.tw-bs blockquote p { + font-size: 17.5px; + font-weight: 300; + line-height: 1.25; +} +.tw-bs blockquote p:last-child { + margin-bottom: 0; +} +.tw-bs blockquote small { + display: block; + line-height: 1.428571429; + color: #999999; +} +.tw-bs blockquote small:before { + content: '\2014 \00A0'; +} +.tw-bs blockquote.pull-right { + padding-right: 15px; + padding-left: 0; + border-right: 5px solid #eeeeee; + border-left: 0; +} +.tw-bs blockquote.pull-right p, +.tw-bs blockquote.pull-right small { + text-align: right; +} +.tw-bs blockquote.pull-right small:before { + content: ''; +} +.tw-bs blockquote.pull-right small:after { + content: '\00A0 \2014'; +} +.tw-bs q:before, +.tw-bs q:after, +.tw-bs blockquote:before, +.tw-bs blockquote:after { + content: ""; +} +.tw-bs address { + display: block; + margin-bottom: 20px; + font-style: normal; + line-height: 1.428571429; +} +.tw-bs code, +.tw-bs pre { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; +} +.tw-bs code { + padding: 2px 4px; + font-size: 90%; + color: #c7254e; + background-color: #f9f2f4; + white-space: nowrap; + border-radius: 4px; +} +.tw-bs pre { + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 1.428571429; + word-break: break-all; + word-wrap: break-word; + color: #333333; + background-color: #f5f5f5; + border: 1px solid #cccccc; + border-radius: 4px; +} +.tw-bs pre.prettyprint { + margin-bottom: 20px; +} +.tw-bs pre code { + padding: 0; + font-size: inherit; + color: inherit; + white-space: pre-wrap; + background-color: transparent; + border: 0; +} +.tw-bs .pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} +.tw-bs .container { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; +} +.tw-bs .container:before, +.tw-bs .container:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .container:after { + clear: both; +} +.tw-bs .container:before, +.tw-bs .container:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .container:after { + clear: both; +} +.tw-bs .row { + margin-left: -15px; + margin-right: -15px; +} +.tw-bs .row:before, +.tw-bs .row:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .row:after { + clear: both; +} +.tw-bs .row:before, +.tw-bs .row:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .row:after { + clear: both; +} +.tw-bs .col-xs-1, +.tw-bs .col-xs-2, +.tw-bs .col-xs-3, +.tw-bs .col-xs-4, +.tw-bs .col-xs-5, +.tw-bs .col-xs-6, +.tw-bs .col-xs-7, +.tw-bs .col-xs-8, +.tw-bs .col-xs-9, +.tw-bs .col-xs-10, +.tw-bs .col-xs-11, +.tw-bs .col-xs-12, +.tw-bs .col-sm-1, +.tw-bs .col-sm-2, +.tw-bs .col-sm-3, +.tw-bs .col-sm-4, +.tw-bs .col-sm-5, +.tw-bs .col-sm-6, +.tw-bs .col-sm-7, +.tw-bs .col-sm-8, +.tw-bs .col-sm-9, +.tw-bs .col-sm-10, +.tw-bs .col-sm-11, +.tw-bs .col-sm-12, +.tw-bs .col-md-1, +.tw-bs .col-md-2, +.tw-bs .col-md-3, +.tw-bs .col-md-4, +.tw-bs .col-md-5, +.tw-bs .col-md-6, +.tw-bs .col-md-7, +.tw-bs .col-md-8, +.tw-bs .col-md-9, +.tw-bs .col-md-10, +.tw-bs .col-md-11, +.tw-bs .col-md-12, +.tw-bs .col-lg-1, +.tw-bs .col-lg-2, +.tw-bs .col-lg-3, +.tw-bs .col-lg-4, +.tw-bs .col-lg-5, +.tw-bs .col-lg-6, +.tw-bs .col-lg-7, +.tw-bs .col-lg-8, +.tw-bs .col-lg-9, +.tw-bs .col-lg-10, +.tw-bs .col-lg-11, +.tw-bs .col-lg-12 { + position: relative; + min-height: 1px; + padding-left: 15px; + padding-right: 15px; +} +.tw-bs .col-xs-1, +.tw-bs .col-xs-2, +.tw-bs .col-xs-3, +.tw-bs .col-xs-4, +.tw-bs .col-xs-5, +.tw-bs .col-xs-6, +.tw-bs .col-xs-7, +.tw-bs .col-xs-8, +.tw-bs .col-xs-9, +.tw-bs .col-xs-10, +.tw-bs .col-xs-11 { + float: left; +} +.tw-bs .col-xs-1 { + width: 8.333333333333332%; +} +.tw-bs .col-xs-2 { + width: 16.666666666666664%; +} +.tw-bs .col-xs-3 { + width: 25%; +} +.tw-bs .col-xs-4 { + width: 33.33333333333333%; +} +.tw-bs .col-xs-5 { + width: 41.66666666666667%; +} +.tw-bs .col-xs-6 { + width: 50%; +} +.tw-bs .col-xs-7 { + width: 58.333333333333336%; +} +.tw-bs .col-xs-8 { + width: 66.66666666666666%; +} +.tw-bs .col-xs-9 { + width: 75%; +} +.tw-bs .col-xs-10 { + width: 83.33333333333334%; +} +.tw-bs .col-xs-11 { + width: 91.66666666666666%; +} +.tw-bs .col-xs-12 { + width: 100%; +} +@media (min-width: 768px) { + .tw-bs .container { + max-width: 750px; + } + .tw-bs .col-sm-1, + .tw-bs .col-sm-2, + .tw-bs .col-sm-3, + .tw-bs .col-sm-4, + .tw-bs .col-sm-5, + .tw-bs .col-sm-6, + .tw-bs .col-sm-7, + .tw-bs .col-sm-8, + .tw-bs .col-sm-9, + .tw-bs .col-sm-10, + .tw-bs .col-sm-11 { + float: left; + } + .tw-bs .col-sm-1 { + width: 8.333333333333332%; + } + .tw-bs .col-sm-2 { + width: 16.666666666666664%; + } + .tw-bs .col-sm-3 { + width: 25%; + } + .tw-bs .col-sm-4 { + width: 33.33333333333333%; + } + .tw-bs .col-sm-5 { + width: 41.66666666666667%; + } + .tw-bs .col-sm-6 { + width: 50%; + } + .tw-bs .col-sm-7 { + width: 58.333333333333336%; + } + .tw-bs .col-sm-8 { + width: 66.66666666666666%; + } + .tw-bs .col-sm-9 { + width: 75%; + } + .tw-bs .col-sm-10 { + width: 83.33333333333334%; + } + .tw-bs .col-sm-11 { + width: 91.66666666666666%; + } + .tw-bs .col-sm-12 { + width: 100%; + } + .tw-bs .col-sm-push-1 { + left: 8.333333333333332%; + } + .tw-bs .col-sm-push-2 { + left: 16.666666666666664%; + } + .tw-bs .col-sm-push-3 { + left: 25%; + } + .tw-bs .col-sm-push-4 { + left: 33.33333333333333%; + } + .tw-bs .col-sm-push-5 { + left: 41.66666666666667%; + } + .tw-bs .col-sm-push-6 { + left: 50%; + } + .tw-bs .col-sm-push-7 { + left: 58.333333333333336%; + } + .tw-bs .col-sm-push-8 { + left: 66.66666666666666%; + } + .tw-bs .col-sm-push-9 { + left: 75%; + } + .tw-bs .col-sm-push-10 { + left: 83.33333333333334%; + } + .tw-bs .col-sm-push-11 { + left: 91.66666666666666%; + } + .tw-bs .col-sm-pull-1 { + right: 8.333333333333332%; + } + .tw-bs .col-sm-pull-2 { + right: 16.666666666666664%; + } + .tw-bs .col-sm-pull-3 { + right: 25%; + } + .tw-bs .col-sm-pull-4 { + right: 33.33333333333333%; + } + .tw-bs .col-sm-pull-5 { + right: 41.66666666666667%; + } + .tw-bs .col-sm-pull-6 { + right: 50%; + } + .tw-bs .col-sm-pull-7 { + right: 58.333333333333336%; + } + .tw-bs .col-sm-pull-8 { + right: 66.66666666666666%; + } + .tw-bs .col-sm-pull-9 { + right: 75%; + } + .tw-bs .col-sm-pull-10 { + right: 83.33333333333334%; + } + .tw-bs .col-sm-pull-11 { + right: 91.66666666666666%; + } + .tw-bs .col-sm-offset-1 { + margin-left: 8.333333333333332%; + } + .tw-bs .col-sm-offset-2 { + margin-left: 16.666666666666664%; + } + .tw-bs .col-sm-offset-3 { + margin-left: 25%; + } + .tw-bs .col-sm-offset-4 { + margin-left: 33.33333333333333%; + } + .tw-bs .col-sm-offset-5 { + margin-left: 41.66666666666667%; + } + .tw-bs .col-sm-offset-6 { + margin-left: 50%; + } + .tw-bs .col-sm-offset-7 { + margin-left: 58.333333333333336%; + } + .tw-bs .col-sm-offset-8 { + margin-left: 66.66666666666666%; + } + .tw-bs .col-sm-offset-9 { + margin-left: 75%; + } + .tw-bs .col-sm-offset-10 { + margin-left: 83.33333333333334%; + } + .tw-bs .col-sm-offset-11 { + margin-left: 91.66666666666666%; + } +} +@media (min-width: 992px) { + .tw-bs .container { + max-width: 970px; + } + .tw-bs .col-md-1, + .tw-bs .col-md-2, + .tw-bs .col-md-3, + .tw-bs .col-md-4, + .tw-bs .col-md-5, + .tw-bs .col-md-6, + .tw-bs .col-md-7, + .tw-bs .col-md-8, + .tw-bs .col-md-9, + .tw-bs .col-md-10, + .tw-bs .col-md-11 { + float: left; + } + .tw-bs .col-md-1 { + width: 8.333333333333332%; + } + .tw-bs .col-md-2 { + width: 16.666666666666664%; + } + .tw-bs .col-md-3 { + width: 25%; + } + .tw-bs .col-md-4 { + width: 33.33333333333333%; + } + .tw-bs .col-md-5 { + width: 41.66666666666667%; + } + .tw-bs .col-md-6 { + width: 50%; + } + .tw-bs .col-md-7 { + width: 58.333333333333336%; + } + .tw-bs .col-md-8 { + width: 66.66666666666666%; + } + .tw-bs .col-md-9 { + width: 75%; + } + .tw-bs .col-md-10 { + width: 83.33333333333334%; + } + .tw-bs .col-md-11 { + width: 91.66666666666666%; + } + .tw-bs .col-md-12 { + width: 100%; + } + .tw-bs .col-md-push-0 { + left: auto; + } + .tw-bs .col-md-push-1 { + left: 8.333333333333332%; + } + .tw-bs .col-md-push-2 { + left: 16.666666666666664%; + } + .tw-bs .col-md-push-3 { + left: 25%; + } + .tw-bs .col-md-push-4 { + left: 33.33333333333333%; + } + .tw-bs .col-md-push-5 { + left: 41.66666666666667%; + } + .tw-bs .col-md-push-6 { + left: 50%; + } + .tw-bs .col-md-push-7 { + left: 58.333333333333336%; + } + .tw-bs .col-md-push-8 { + left: 66.66666666666666%; + } + .tw-bs .col-md-push-9 { + left: 75%; + } + .tw-bs .col-md-push-10 { + left: 83.33333333333334%; + } + .tw-bs .col-md-push-11 { + left: 91.66666666666666%; + } + .tw-bs .col-md-pull-0 { + right: auto; + } + .tw-bs .col-md-pull-1 { + right: 8.333333333333332%; + } + .tw-bs .col-md-pull-2 { + right: 16.666666666666664%; + } + .tw-bs .col-md-pull-3 { + right: 25%; + } + .tw-bs .col-md-pull-4 { + right: 33.33333333333333%; + } + .tw-bs .col-md-pull-5 { + right: 41.66666666666667%; + } + .tw-bs .col-md-pull-6 { + right: 50%; + } + .tw-bs .col-md-pull-7 { + right: 58.333333333333336%; + } + .tw-bs .col-md-pull-8 { + right: 66.66666666666666%; + } + .tw-bs .col-md-pull-9 { + right: 75%; + } + .tw-bs .col-md-pull-10 { + right: 83.33333333333334%; + } + .tw-bs .col-md-pull-11 { + right: 91.66666666666666%; + } + .tw-bs .col-md-offset-0 { + margin-left: 0; + } + .tw-bs .col-md-offset-1 { + margin-left: 8.333333333333332%; + } + .tw-bs .col-md-offset-2 { + margin-left: 16.666666666666664%; + } + .tw-bs .col-md-offset-3 { + margin-left: 25%; + } + .tw-bs .col-md-offset-4 { + margin-left: 33.33333333333333%; + } + .tw-bs .col-md-offset-5 { + margin-left: 41.66666666666667%; + } + .tw-bs .col-md-offset-6 { + margin-left: 50%; + } + .tw-bs .col-md-offset-7 { + margin-left: 58.333333333333336%; + } + .tw-bs .col-md-offset-8 { + margin-left: 66.66666666666666%; + } + .tw-bs .col-md-offset-9 { + margin-left: 75%; + } + .tw-bs .col-md-offset-10 { + margin-left: 83.33333333333334%; + } + .tw-bs .col-md-offset-11 { + margin-left: 91.66666666666666%; + } +} +@media (min-width: 1200px) { + .tw-bs .container { + max-width: 1170px; + } + .tw-bs .col-lg-1, + .tw-bs .col-lg-2, + .tw-bs .col-lg-3, + .tw-bs .col-lg-4, + .tw-bs .col-lg-5, + .tw-bs .col-lg-6, + .tw-bs .col-lg-7, + .tw-bs .col-lg-8, + .tw-bs .col-lg-9, + .tw-bs .col-lg-10, + .tw-bs .col-lg-11 { + float: left; + } + .tw-bs .col-lg-1 { + width: 8.333333333333332%; + } + .tw-bs .col-lg-2 { + width: 16.666666666666664%; + } + .tw-bs .col-lg-3 { + width: 25%; + } + .tw-bs .col-lg-4 { + width: 33.33333333333333%; + } + .tw-bs .col-lg-5 { + width: 41.66666666666667%; + } + .tw-bs .col-lg-6 { + width: 50%; + } + .tw-bs .col-lg-7 { + width: 58.333333333333336%; + } + .tw-bs .col-lg-8 { + width: 66.66666666666666%; + } + .tw-bs .col-lg-9 { + width: 75%; + } + .tw-bs .col-lg-10 { + width: 83.33333333333334%; + } + .tw-bs .col-lg-11 { + width: 91.66666666666666%; + } + .tw-bs .col-lg-12 { + width: 100%; + } + .tw-bs .col-lg-push-0 { + left: auto; + } + .tw-bs .col-lg-push-1 { + left: 8.333333333333332%; + } + .tw-bs .col-lg-push-2 { + left: 16.666666666666664%; + } + .tw-bs .col-lg-push-3 { + left: 25%; + } + .tw-bs .col-lg-push-4 { + left: 33.33333333333333%; + } + .tw-bs .col-lg-push-5 { + left: 41.66666666666667%; + } + .tw-bs .col-lg-push-6 { + left: 50%; + } + .tw-bs .col-lg-push-7 { + left: 58.333333333333336%; + } + .tw-bs .col-lg-push-8 { + left: 66.66666666666666%; + } + .tw-bs .col-lg-push-9 { + left: 75%; + } + .tw-bs .col-lg-push-10 { + left: 83.33333333333334%; + } + .tw-bs .col-lg-push-11 { + left: 91.66666666666666%; + } + .tw-bs .col-lg-pull-0 { + right: auto; + } + .tw-bs .col-lg-pull-1 { + right: 8.333333333333332%; + } + .tw-bs .col-lg-pull-2 { + right: 16.666666666666664%; + } + .tw-bs .col-lg-pull-3 { + right: 25%; + } + .tw-bs .col-lg-pull-4 { + right: 33.33333333333333%; + } + .tw-bs .col-lg-pull-5 { + right: 41.66666666666667%; + } + .tw-bs .col-lg-pull-6 { + right: 50%; + } + .tw-bs .col-lg-pull-7 { + right: 58.333333333333336%; + } + .tw-bs .col-lg-pull-8 { + right: 66.66666666666666%; + } + .tw-bs .col-lg-pull-9 { + right: 75%; + } + .tw-bs .col-lg-pull-10 { + right: 83.33333333333334%; + } + .tw-bs .col-lg-pull-11 { + right: 91.66666666666666%; + } + .tw-bs .col-lg-offset-0 { + margin-left: 0; + } + .tw-bs .col-lg-offset-1 { + margin-left: 8.333333333333332%; + } + .tw-bs .col-lg-offset-2 { + margin-left: 16.666666666666664%; + } + .tw-bs .col-lg-offset-3 { + margin-left: 25%; + } + .tw-bs .col-lg-offset-4 { + margin-left: 33.33333333333333%; + } + .tw-bs .col-lg-offset-5 { + margin-left: 41.66666666666667%; + } + .tw-bs .col-lg-offset-6 { + margin-left: 50%; + } + .tw-bs .col-lg-offset-7 { + margin-left: 58.333333333333336%; + } + .tw-bs .col-lg-offset-8 { + margin-left: 66.66666666666666%; + } + .tw-bs .col-lg-offset-9 { + margin-left: 75%; + } + .tw-bs .col-lg-offset-10 { + margin-left: 83.33333333333334%; + } + .tw-bs .col-lg-offset-11 { + margin-left: 91.66666666666666%; + } +} +.tw-bs table { + max-width: 100%; + background-color: transparent; +} +.tw-bs th { + text-align: left; +} +.tw-bs .table { + width: 100%; + margin-bottom: 20px; +} +.tw-bs .table thead > tr > th, +.tw-bs .table tbody > tr > th, +.tw-bs .table tfoot > tr > th, +.tw-bs .table thead > tr > td, +.tw-bs .table tbody > tr > td, +.tw-bs .table tfoot > tr > td { + padding: 8px; + line-height: 1.428571429; + vertical-align: top; + border-top: 1px solid #dddddd; +} +.tw-bs .table thead > tr > th { + vertical-align: bottom; + border-bottom: 2px solid #dddddd; +} +.tw-bs .table caption + thead tr:first-child th, +.tw-bs .table colgroup + thead tr:first-child th, +.tw-bs .table thead:first-child tr:first-child th, +.tw-bs .table caption + thead tr:first-child td, +.tw-bs .table colgroup + thead tr:first-child td, +.tw-bs .table thead:first-child tr:first-child td { + border-top: 0; +} +.tw-bs .table tbody + tbody { + border-top: 2px solid #dddddd; +} +.tw-bs .table .table { + background-color: #ffffff; +} +.tw-bs .table-condensed thead > tr > th, +.tw-bs .table-condensed tbody > tr > th, +.tw-bs .table-condensed tfoot > tr > th, +.tw-bs .table-condensed thead > tr > td, +.tw-bs .table-condensed tbody > tr > td, +.tw-bs .table-condensed tfoot > tr > td { + padding: 5px; +} +.tw-bs .table-bordered { + border: 1px solid #dddddd; +} +.tw-bs .table-bordered > thead > tr > th, +.tw-bs .table-bordered > tbody > tr > th, +.tw-bs .table-bordered > tfoot > tr > th, +.tw-bs .table-bordered > thead > tr > td, +.tw-bs .table-bordered > tbody > tr > td, +.tw-bs .table-bordered > tfoot > tr > td { + border: 1px solid #dddddd; +} +.tw-bs .table-bordered > thead > tr > th, +.tw-bs .table-bordered > thead > tr > td { + border-bottom-width: 2px; +} +.tw-bs .table-striped > tbody > tr:nth-child(odd) > td, +.tw-bs .table-striped > tbody > tr:nth-child(odd) > th { + background-color: #f9f9f9; +} +.tw-bs .table-hover > tbody > tr:hover > td, +.tw-bs .table-hover > tbody > tr:hover > th { + background-color: #f5f5f5; +} +.tw-bs table col[class*="col-"] { + float: none; + display: table-column; +} +.tw-bs table td[class*="col-"], +.tw-bs table th[class*="col-"] { + float: none; + display: table-cell; +} +.tw-bs .table > thead > tr > td.active, +.tw-bs .table > tbody > tr > td.active, +.tw-bs .table > tfoot > tr > td.active, +.tw-bs .table > thead > tr > th.active, +.tw-bs .table > tbody > tr > th.active, +.tw-bs .table > tfoot > tr > th.active, +.tw-bs .table > thead > tr.active > td, +.tw-bs .table > tbody > tr.active > td, +.tw-bs .table > tfoot > tr.active > td, +.tw-bs .table > thead > tr.active > th, +.tw-bs .table > tbody > tr.active > th, +.tw-bs .table > tfoot > tr.active > th { + background-color: #f5f5f5; +} +.tw-bs .table > thead > tr > td.success, +.tw-bs .table > tbody > tr > td.success, +.tw-bs .table > tfoot > tr > td.success, +.tw-bs .table > thead > tr > th.success, +.tw-bs .table > tbody > tr > th.success, +.tw-bs .table > tfoot > tr > th.success, +.tw-bs .table > thead > tr.success > td, +.tw-bs .table > tbody > tr.success > td, +.tw-bs .table > tfoot > tr.success > td, +.tw-bs .table > thead > tr.success > th, +.tw-bs .table > tbody > tr.success > th, +.tw-bs .table > tfoot > tr.success > th { + background-color: #dff0d8; + border-color: #d6e9c6; +} +.tw-bs .table-hover > tbody > tr > td.success:hover, +.tw-bs .table-hover > tbody > tr > th.success:hover, +.tw-bs .table-hover > tbody > tr.success:hover > td { + background-color: #d0e9c6; + border-color: #c9e2b3; +} +.tw-bs .table > thead > tr > td.danger, +.tw-bs .table > tbody > tr > td.danger, +.tw-bs .table > tfoot > tr > td.danger, +.tw-bs .table > thead > tr > th.danger, +.tw-bs .table > tbody > tr > th.danger, +.tw-bs .table > tfoot > tr > th.danger, +.tw-bs .table > thead > tr.danger > td, +.tw-bs .table > tbody > tr.danger > td, +.tw-bs .table > tfoot > tr.danger > td, +.tw-bs .table > thead > tr.danger > th, +.tw-bs .table > tbody > tr.danger > th, +.tw-bs .table > tfoot > tr.danger > th { + background-color: #f2dede; + border-color: #eed3d7; +} +.tw-bs .table-hover > tbody > tr > td.danger:hover, +.tw-bs .table-hover > tbody > tr > th.danger:hover, +.tw-bs .table-hover > tbody > tr.danger:hover > td { + background-color: #ebcccc; + border-color: #e6c1c7; +} +.tw-bs .table > thead > tr > td.warning, +.tw-bs .table > tbody > tr > td.warning, +.tw-bs .table > tfoot > tr > td.warning, +.tw-bs .table > thead > tr > th.warning, +.tw-bs .table > tbody > tr > th.warning, +.tw-bs .table > tfoot > tr > th.warning, +.tw-bs .table > thead > tr.warning > td, +.tw-bs .table > tbody > tr.warning > td, +.tw-bs .table > tfoot > tr.warning > td, +.tw-bs .table > thead > tr.warning > th, +.tw-bs .table > tbody > tr.warning > th, +.tw-bs .table > tfoot > tr.warning > th { + background-color: #fcf8e3; + border-color: #fbeed5; +} +.tw-bs .table-hover > tbody > tr > td.warning:hover, +.tw-bs .table-hover > tbody > tr > th.warning:hover, +.tw-bs .table-hover > tbody > tr.warning:hover > td { + background-color: #faf2cc; + border-color: #f8e5be; +} +@media (max-width: 768px) { + .tw-bs .table-responsive { + width: 100%; + margin-bottom: 15px; + overflow-y: hidden; + overflow-x: scroll; + border: 1px solid #dddddd; + } + .tw-bs .table-responsive > .table { + margin-bottom: 0; + background-color: #fff; + } + .tw-bs .table-responsive > .table > thead > tr > th, + .tw-bs .table-responsive > .table > tbody > tr > th, + .tw-bs .table-responsive > .table > tfoot > tr > th, + .tw-bs .table-responsive > .table > thead > tr > td, + .tw-bs .table-responsive > .table > tbody > tr > td, + .tw-bs .table-responsive > .table > tfoot > tr > td { + white-space: nowrap; + } + .tw-bs .table-responsive > .table-bordered { + border: 0; + } + .tw-bs .table-responsive > .table-bordered > thead > tr > th:first-child, + .tw-bs .table-responsive > .table-bordered > tbody > tr > th:first-child, + .tw-bs .table-responsive > .table-bordered > tfoot > tr > th:first-child, + .tw-bs .table-responsive > .table-bordered > thead > tr > td:first-child, + .tw-bs .table-responsive > .table-bordered > tbody > tr > td:first-child, + .tw-bs .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; + } + .tw-bs .table-responsive > .table-bordered > thead > tr > th:last-child, + .tw-bs .table-responsive > .table-bordered > tbody > tr > th:last-child, + .tw-bs .table-responsive > .table-bordered > tfoot > tr > th:last-child, + .tw-bs .table-responsive > .table-bordered > thead > tr > td:last-child, + .tw-bs .table-responsive > .table-bordered > tbody > tr > td:last-child, + .tw-bs .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; + } + .tw-bs .table-responsive > .table-bordered > thead > tr:last-child > th, + .tw-bs .table-responsive > .table-bordered > tbody > tr:last-child > th, + .tw-bs .table-responsive > .table-bordered > tfoot > tr:last-child > th, + .tw-bs .table-responsive > .table-bordered > thead > tr:last-child > td, + .tw-bs .table-responsive > .table-bordered > tbody > tr:last-child > td, + .tw-bs .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; + } +} +.tw-bs fieldset { + padding: 0; + margin: 0; + border: 0; +} +.tw-bs legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: 20px; + font-size: 21px; + line-height: inherit; + color: #333333; + border: 0; + border-bottom: 1px solid #e5e5e5; +} +.tw-bs label { + display: inline-block; + margin-bottom: 5px; + font-weight: bold; +} +.tw-bs input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.tw-bs input[type="radio"], +.tw-bs input[type="checkbox"] { + margin: 4px 0 0; + margin-top: 1px \9; + /* IE8-9 */ + line-height: normal; +} +.tw-bs input[type="file"] { + display: block; +} +.tw-bs select[multiple], +.tw-bs select[size] { + height: auto; +} +.tw-bs select optgroup { + font-size: inherit; + font-style: inherit; + font-family: inherit; +} +.tw-bs input[type="file"]:focus, +.tw-bs input[type="radio"]:focus, +.tw-bs input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.tw-bs input[type="number"]::-webkit-outer-spin-button, +.tw-bs input[type="number"]::-webkit-inner-spin-button { + height: auto; +} +.tw-bs .form-control:-moz-placeholder { + color: #999999; +} +.tw-bs .form-control::-moz-placeholder { + color: #999999; +} +.tw-bs .form-control:-ms-input-placeholder { + color: #999999; +} +.tw-bs .form-control::-webkit-input-placeholder { + color: #999999; +} +.tw-bs .form-control { + display: block; + width: 100%; + height: 34px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.428571429; + color: #555555; + vertical-align: middle; + background-color: #ffffff; + border: 1px solid #cccccc; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} +.tw-bs .form-control:focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); +} +.tw-bs .form-control[disabled], +.tw-bs .form-control[readonly], +fieldset[disabled] .tw-bs .form-control { + cursor: not-allowed; + background-color: #eeeeee; +} +textarea.tw-bs .form-control { + height: auto; +} +.tw-bs .form-group { + margin-bottom: 15px; +} +.tw-bs .radio, +.tw-bs .checkbox { + display: block; + min-height: 20px; + margin-top: 10px; + margin-bottom: 10px; + padding-left: 20px; + vertical-align: middle; +} +.tw-bs .radio label, +.tw-bs .checkbox label { + display: inline; + margin-bottom: 0; + font-weight: normal; + cursor: pointer; +} +.tw-bs .radio input[type="radio"], +.tw-bs .radio-inline input[type="radio"], +.tw-bs .checkbox input[type="checkbox"], +.tw-bs .checkbox-inline input[type="checkbox"] { + float: left; + margin-left: -20px; +} +.tw-bs .radio + .radio, +.tw-bs .checkbox + .checkbox { + margin-top: -5px; +} +.tw-bs .radio-inline, +.tw-bs .checkbox-inline { + display: inline-block; + padding-left: 20px; + margin-bottom: 0; + vertical-align: middle; + font-weight: normal; + cursor: pointer; +} +.tw-bs .radio-inline + .radio-inline, +.tw-bs .checkbox-inline + .checkbox-inline { + margin-top: 0; + margin-left: 10px; +} +.tw-bs input[type="radio"][disabled], +.tw-bs input[type="checkbox"][disabled], +.tw-bs .radio[disabled], +.tw-bs .radio-inline[disabled], +.tw-bs .checkbox[disabled], +.tw-bs .checkbox-inline[disabled], +fieldset[disabled] .tw-bs input[type="radio"], +fieldset[disabled] .tw-bs input[type="checkbox"], +fieldset[disabled] .tw-bs .radio, +fieldset[disabled] .tw-bs .radio-inline, +fieldset[disabled] .tw-bs .checkbox, +fieldset[disabled] .tw-bs .checkbox-inline { + cursor: not-allowed; +} +.tw-bs .input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.tw-bs .input-sm { + height: 30px; + line-height: 30px; +} +textarea.tw-bs .input-sm { + height: auto; +} +.tw-bs .input-lg { + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +select.tw-bs .input-lg { + height: 45px; + line-height: 45px; +} +textarea.tw-bs .input-lg { + height: auto; +} +.tw-bs .has-warning .help-block, +.tw-bs .has-warning .control-label { + color: #c09853; +} +.tw-bs .has-warning .form-control { + border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.tw-bs .has-warning .form-control:focus { + border-color: #a47e3c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; +} +.tw-bs .has-warning .input-group-addon { + color: #c09853; + border-color: #c09853; + background-color: #fcf8e3; +} +.tw-bs .has-error .help-block, +.tw-bs .has-error .control-label { + color: #b94a48; +} +.tw-bs .has-error .form-control { + border-color: #b94a48; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.tw-bs .has-error .form-control:focus { + border-color: #953b39; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; +} +.tw-bs .has-error .input-group-addon { + color: #b94a48; + border-color: #b94a48; + background-color: #f2dede; +} +.tw-bs .has-success .help-block, +.tw-bs .has-success .control-label { + color: #468847; +} +.tw-bs .has-success .form-control { + border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.tw-bs .has-success .form-control:focus { + border-color: #356635; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; +} +.tw-bs .has-success .input-group-addon { + color: #468847; + border-color: #468847; + background-color: #dff0d8; +} +.tw-bs .form-control-static { + margin-bottom: 0; + padding-top: 7px; +} +.tw-bs .help-block { + display: block; + margin-top: 5px; + margin-bottom: 10px; + color: #737373; +} +@media (min-width: 768px) { + .tw-bs .form-inline .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .tw-bs .form-inline .form-control { + display: inline-block; + } + .tw-bs .form-inline .radio, + .tw-bs .form-inline .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + padding-left: 0; + } + .tw-bs .form-inline .radio input[type="radio"], + .tw-bs .form-inline .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } +} +.tw-bs .form-horizontal .control-label, +.tw-bs .form-horizontal .radio, +.tw-bs .form-horizontal .checkbox, +.tw-bs .form-horizontal .radio-inline, +.tw-bs .form-horizontal .checkbox-inline { + margin-top: 0; + margin-bottom: 0; + padding-top: 7px; +} +.tw-bs .form-horizontal .form-group { + margin-left: -15px; + margin-right: -15px; +} +.tw-bs .form-horizontal .form-group:before, +.tw-bs .form-horizontal .form-group:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .form-horizontal .form-group:after { + clear: both; +} +.tw-bs .form-horizontal .form-group:before, +.tw-bs .form-horizontal .form-group:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .form-horizontal .form-group:after { + clear: both; +} +@media (min-width: 768px) { + .tw-bs .form-horizontal .control-label { + text-align: right; + } +} +.tw-bs .btn { + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; + font-size: 14px; + font-weight: normal; + line-height: 1.428571429; + text-align: center; + vertical-align: middle; + cursor: pointer; + border: 1px solid transparent; + border-radius: 4px; + white-space: nowrap; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} +.tw-bs .btn:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.tw-bs .btn:hover, +.tw-bs .btn:focus { + color: #333333; + text-decoration: none; +} +.tw-bs .btn:active, +.tw-bs .btn.active { + outline: 0; + background-image: none; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.tw-bs .btn.disabled, +.tw-bs .btn[disabled], +fieldset[disabled] .tw-bs .btn { + cursor: not-allowed; + pointer-events: none; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; +} +.tw-bs .btn-default { + color: #333333; + background-color: #ffffff; + border-color: #cccccc; +} +.tw-bs .btn-default:hover, +.tw-bs .btn-default:focus, +.tw-bs .btn-default:active, +.tw-bs .btn-default.active, +.open .dropdown-toggle.tw-bs .btn-default { + color: #333333; + background-color: #ebebeb; + border-color: #adadad; +} +.tw-bs .btn-default:active, +.tw-bs .btn-default.active, +.open .dropdown-toggle.tw-bs .btn-default { + background-image: none; +} +.tw-bs .btn-default.disabled, +.tw-bs .btn-default[disabled], +fieldset[disabled] .tw-bs .btn-default, +.tw-bs .btn-default.disabled:hover, +.tw-bs .btn-default[disabled]:hover, +fieldset[disabled] .tw-bs .btn-default:hover, +.tw-bs .btn-default.disabled:focus, +.tw-bs .btn-default[disabled]:focus, +fieldset[disabled] .tw-bs .btn-default:focus, +.tw-bs .btn-default.disabled:active, +.tw-bs .btn-default[disabled]:active, +fieldset[disabled] .tw-bs .btn-default:active, +.tw-bs .btn-default.disabled.active, +.tw-bs .btn-default[disabled].active, +fieldset[disabled] .tw-bs .btn-default.active { + background-color: #ffffff; + border-color: #cccccc; +} +.tw-bs .btn-primary { + color: #ffffff; + background-color: #428bca; + border-color: #357ebd; +} +.tw-bs .btn-primary:hover, +.tw-bs .btn-primary:focus, +.tw-bs .btn-primary:active, +.tw-bs .btn-primary.active, +.open .dropdown-toggle.tw-bs .btn-primary { + color: #ffffff; + background-color: #3276b1; + border-color: #285e8e; +} +.tw-bs .btn-primary:active, +.tw-bs .btn-primary.active, +.open .dropdown-toggle.tw-bs .btn-primary { + background-image: none; +} +.tw-bs .btn-primary.disabled, +.tw-bs .btn-primary[disabled], +fieldset[disabled] .tw-bs .btn-primary, +.tw-bs .btn-primary.disabled:hover, +.tw-bs .btn-primary[disabled]:hover, +fieldset[disabled] .tw-bs .btn-primary:hover, +.tw-bs .btn-primary.disabled:focus, +.tw-bs .btn-primary[disabled]:focus, +fieldset[disabled] .tw-bs .btn-primary:focus, +.tw-bs .btn-primary.disabled:active, +.tw-bs .btn-primary[disabled]:active, +fieldset[disabled] .tw-bs .btn-primary:active, +.tw-bs .btn-primary.disabled.active, +.tw-bs .btn-primary[disabled].active, +fieldset[disabled] .tw-bs .btn-primary.active { + background-color: #428bca; + border-color: #357ebd; +} +.tw-bs .btn-warning { + color: #ffffff; + background-color: #f0ad4e; + border-color: #eea236; +} +.tw-bs .btn-warning:hover, +.tw-bs .btn-warning:focus, +.tw-bs .btn-warning:active, +.tw-bs .btn-warning.active, +.open .dropdown-toggle.tw-bs .btn-warning { + color: #ffffff; + background-color: #ed9c28; + border-color: #d58512; +} +.tw-bs .btn-warning:active, +.tw-bs .btn-warning.active, +.open .dropdown-toggle.tw-bs .btn-warning { + background-image: none; +} +.tw-bs .btn-warning.disabled, +.tw-bs .btn-warning[disabled], +fieldset[disabled] .tw-bs .btn-warning, +.tw-bs .btn-warning.disabled:hover, +.tw-bs .btn-warning[disabled]:hover, +fieldset[disabled] .tw-bs .btn-warning:hover, +.tw-bs .btn-warning.disabled:focus, +.tw-bs .btn-warning[disabled]:focus, +fieldset[disabled] .tw-bs .btn-warning:focus, +.tw-bs .btn-warning.disabled:active, +.tw-bs .btn-warning[disabled]:active, +fieldset[disabled] .tw-bs .btn-warning:active, +.tw-bs .btn-warning.disabled.active, +.tw-bs .btn-warning[disabled].active, +fieldset[disabled] .tw-bs .btn-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.tw-bs .btn-danger { + color: #ffffff; + background-color: #d9534f; + border-color: #d43f3a; +} +.tw-bs .btn-danger:hover, +.tw-bs .btn-danger:focus, +.tw-bs .btn-danger:active, +.tw-bs .btn-danger.active, +.open .dropdown-toggle.tw-bs .btn-danger { + color: #ffffff; + background-color: #d2322d; + border-color: #ac2925; +} +.tw-bs .btn-danger:active, +.tw-bs .btn-danger.active, +.open .dropdown-toggle.tw-bs .btn-danger { + background-image: none; +} +.tw-bs .btn-danger.disabled, +.tw-bs .btn-danger[disabled], +fieldset[disabled] .tw-bs .btn-danger, +.tw-bs .btn-danger.disabled:hover, +.tw-bs .btn-danger[disabled]:hover, +fieldset[disabled] .tw-bs .btn-danger:hover, +.tw-bs .btn-danger.disabled:focus, +.tw-bs .btn-danger[disabled]:focus, +fieldset[disabled] .tw-bs .btn-danger:focus, +.tw-bs .btn-danger.disabled:active, +.tw-bs .btn-danger[disabled]:active, +fieldset[disabled] .tw-bs .btn-danger:active, +.tw-bs .btn-danger.disabled.active, +.tw-bs .btn-danger[disabled].active, +fieldset[disabled] .tw-bs .btn-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.tw-bs .btn-success { + color: #ffffff; + background-color: #5cb85c; + border-color: #4cae4c; +} +.tw-bs .btn-success:hover, +.tw-bs .btn-success:focus, +.tw-bs .btn-success:active, +.tw-bs .btn-success.active, +.open .dropdown-toggle.tw-bs .btn-success { + color: #ffffff; + background-color: #47a447; + border-color: #398439; +} +.tw-bs .btn-success:active, +.tw-bs .btn-success.active, +.open .dropdown-toggle.tw-bs .btn-success { + background-image: none; +} +.tw-bs .btn-success.disabled, +.tw-bs .btn-success[disabled], +fieldset[disabled] .tw-bs .btn-success, +.tw-bs .btn-success.disabled:hover, +.tw-bs .btn-success[disabled]:hover, +fieldset[disabled] .tw-bs .btn-success:hover, +.tw-bs .btn-success.disabled:focus, +.tw-bs .btn-success[disabled]:focus, +fieldset[disabled] .tw-bs .btn-success:focus, +.tw-bs .btn-success.disabled:active, +.tw-bs .btn-success[disabled]:active, +fieldset[disabled] .tw-bs .btn-success:active, +.tw-bs .btn-success.disabled.active, +.tw-bs .btn-success[disabled].active, +fieldset[disabled] .tw-bs .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} +.tw-bs .btn-info { + color: #ffffff; + background-color: #5bc0de; + border-color: #46b8da; +} +.tw-bs .btn-info:hover, +.tw-bs .btn-info:focus, +.tw-bs .btn-info:active, +.tw-bs .btn-info.active, +.open .dropdown-toggle.tw-bs .btn-info { + color: #ffffff; + background-color: #39b3d7; + border-color: #269abc; +} +.tw-bs .btn-info:active, +.tw-bs .btn-info.active, +.open .dropdown-toggle.tw-bs .btn-info { + background-image: none; +} +.tw-bs .btn-info.disabled, +.tw-bs .btn-info[disabled], +fieldset[disabled] .tw-bs .btn-info, +.tw-bs .btn-info.disabled:hover, +.tw-bs .btn-info[disabled]:hover, +fieldset[disabled] .tw-bs .btn-info:hover, +.tw-bs .btn-info.disabled:focus, +.tw-bs .btn-info[disabled]:focus, +fieldset[disabled] .tw-bs .btn-info:focus, +.tw-bs .btn-info.disabled:active, +.tw-bs .btn-info[disabled]:active, +fieldset[disabled] .tw-bs .btn-info:active, +.tw-bs .btn-info.disabled.active, +.tw-bs .btn-info[disabled].active, +fieldset[disabled] .tw-bs .btn-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.tw-bs .btn-link { + color: #428bca; + font-weight: normal; + cursor: pointer; + border-radius: 0; +} +.tw-bs .btn-link, +.tw-bs .btn-link:active, +.tw-bs .btn-link[disabled], +fieldset[disabled] .tw-bs .btn-link { + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} +.tw-bs .btn-link, +.tw-bs .btn-link:hover, +.tw-bs .btn-link:focus, +.tw-bs .btn-link:active { + border-color: transparent; +} +.tw-bs .btn-link:hover, +.tw-bs .btn-link:focus { + color: #2a6496; + text-decoration: underline; + background-color: transparent; +} +.tw-bs .btn-link[disabled]:hover, +fieldset[disabled] .tw-bs .btn-link:hover, +.tw-bs .btn-link[disabled]:focus, +fieldset[disabled] .tw-bs .btn-link:focus { + color: #999999; + text-decoration: none; +} +.tw-bs .btn-lg { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.tw-bs .btn-sm, +.tw-bs .btn-xs { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.tw-bs .btn-xs { + padding: 1px 5px; +} +.tw-bs .btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; +} +.tw-bs .btn-block + .btn-block { + margin-top: 5px; +} +.tw-bs input[type="submit"].btn-block, +.tw-bs input[type="reset"].btn-block, +.tw-bs input[type="button"].btn-block { + width: 100%; +} +.tw-bs .fade { + opacity: 0; + -webkit-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; +} +.tw-bs .fade.in { + opacity: 1; +} +.tw-bs .collapse { + display: none; +} +.tw-bs .collapse.in { + display: block; +} +.tw-bs .collapsing { + position: relative; + height: 0; + overflow: hidden; + -webkit-transition: height 0.35s ease; + transition: height 0.35s ease; +} +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../fonts/glyphicons-halflings-regular.eot'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); +} +.tw-bs .glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; +} +.tw-bs .glyphicon-asterisk:before { + content: "\2a"; +} +.tw-bs .glyphicon-plus:before { + content: "\2b"; +} +.tw-bs .glyphicon-euro:before { + content: "\20ac"; +} +.tw-bs .glyphicon-minus:before { + content: "\2212"; +} +.tw-bs .glyphicon-cloud:before { + content: "\2601"; +} +.tw-bs .glyphicon-envelope:before { + content: "\2709"; +} +.tw-bs .glyphicon-pencil:before { + content: "\270f"; +} +.tw-bs .glyphicon-glass:before { + content: "\e001"; +} +.tw-bs .glyphicon-music:before { + content: "\e002"; +} +.tw-bs .glyphicon-search:before { + content: "\e003"; +} +.tw-bs .glyphicon-heart:before { + content: "\e005"; +} +.tw-bs .glyphicon-star:before { + content: "\e006"; +} +.tw-bs .glyphicon-star-empty:before { + content: "\e007"; +} +.tw-bs .glyphicon-user:before { + content: "\e008"; +} +.tw-bs .glyphicon-film:before { + content: "\e009"; +} +.tw-bs .glyphicon-th-large:before { + content: "\e010"; +} +.tw-bs .glyphicon-th:before { + content: "\e011"; +} +.tw-bs .glyphicon-th-list:before { + content: "\e012"; +} +.tw-bs .glyphicon-ok:before { + content: "\e013"; +} +.tw-bs .glyphicon-remove:before { + content: "\e014"; +} +.tw-bs .glyphicon-zoom-in:before { + content: "\e015"; +} +.tw-bs .glyphicon-zoom-out:before { + content: "\e016"; +} +.tw-bs .glyphicon-off:before { + content: "\e017"; +} +.tw-bs .glyphicon-signal:before { + content: "\e018"; +} +.tw-bs .glyphicon-cog:before { + content: "\e019"; +} +.tw-bs .glyphicon-trash:before { + content: "\e020"; +} +.tw-bs .glyphicon-home:before { + content: "\e021"; +} +.tw-bs .glyphicon-file:before { + content: "\e022"; +} +.tw-bs .glyphicon-time:before { + content: "\e023"; +} +.tw-bs .glyphicon-road:before { + content: "\e024"; +} +.tw-bs .glyphicon-download-alt:before { + content: "\e025"; +} +.tw-bs .glyphicon-download:before { + content: "\e026"; +} +.tw-bs .glyphicon-upload:before { + content: "\e027"; +} +.tw-bs .glyphicon-inbox:before { + content: "\e028"; +} +.tw-bs .glyphicon-play-circle:before { + content: "\e029"; +} +.tw-bs .glyphicon-repeat:before { + content: "\e030"; +} +.tw-bs .glyphicon-refresh:before { + content: "\e031"; +} +.tw-bs .glyphicon-list-alt:before { + content: "\e032"; +} +.tw-bs .glyphicon-flag:before { + content: "\e034"; +} +.tw-bs .glyphicon-headphones:before { + content: "\e035"; +} +.tw-bs .glyphicon-volume-off:before { + content: "\e036"; +} +.tw-bs .glyphicon-volume-down:before { + content: "\e037"; +} +.tw-bs .glyphicon-volume-up:before { + content: "\e038"; +} +.tw-bs .glyphicon-qrcode:before { + content: "\e039"; +} +.tw-bs .glyphicon-barcode:before { + content: "\e040"; +} +.tw-bs .glyphicon-tag:before { + content: "\e041"; +} +.tw-bs .glyphicon-tags:before { + content: "\e042"; +} +.tw-bs .glyphicon-book:before { + content: "\e043"; +} +.tw-bs .glyphicon-print:before { + content: "\e045"; +} +.tw-bs .glyphicon-font:before { + content: "\e047"; +} +.tw-bs .glyphicon-bold:before { + content: "\e048"; +} +.tw-bs .glyphicon-italic:before { + content: "\e049"; +} +.tw-bs .glyphicon-text-height:before { + content: "\e050"; +} +.tw-bs .glyphicon-text-width:before { + content: "\e051"; +} +.tw-bs .glyphicon-align-left:before { + content: "\e052"; +} +.tw-bs .glyphicon-align-center:before { + content: "\e053"; +} +.tw-bs .glyphicon-align-right:before { + content: "\e054"; +} +.tw-bs .glyphicon-align-justify:before { + content: "\e055"; +} +.tw-bs .glyphicon-list:before { + content: "\e056"; +} +.tw-bs .glyphicon-indent-left:before { + content: "\e057"; +} +.tw-bs .glyphicon-indent-right:before { + content: "\e058"; +} +.tw-bs .glyphicon-facetime-video:before { + content: "\e059"; +} +.tw-bs .glyphicon-picture:before { + content: "\e060"; +} +.tw-bs .glyphicon-map-marker:before { + content: "\e062"; +} +.tw-bs .glyphicon-adjust:before { + content: "\e063"; +} +.tw-bs .glyphicon-tint:before { + content: "\e064"; +} +.tw-bs .glyphicon-edit:before { + content: "\e065"; +} +.tw-bs .glyphicon-share:before { + content: "\e066"; +} +.tw-bs .glyphicon-check:before { + content: "\e067"; +} +.tw-bs .glyphicon-move:before { + content: "\e068"; +} +.tw-bs .glyphicon-step-backward:before { + content: "\e069"; +} +.tw-bs .glyphicon-fast-backward:before { + content: "\e070"; +} +.tw-bs .glyphicon-backward:before { + content: "\e071"; +} +.tw-bs .glyphicon-play:before { + content: "\e072"; +} +.tw-bs .glyphicon-pause:before { + content: "\e073"; +} +.tw-bs .glyphicon-stop:before { + content: "\e074"; +} +.tw-bs .glyphicon-forward:before { + content: "\e075"; +} +.tw-bs .glyphicon-fast-forward:before { + content: "\e076"; +} +.tw-bs .glyphicon-step-forward:before { + content: "\e077"; +} +.tw-bs .glyphicon-eject:before { + content: "\e078"; +} +.tw-bs .glyphicon-chevron-left:before { + content: "\e079"; +} +.tw-bs .glyphicon-chevron-right:before { + content: "\e080"; +} +.tw-bs .glyphicon-plus-sign:before { + content: "\e081"; +} +.tw-bs .glyphicon-minus-sign:before { + content: "\e082"; +} +.tw-bs .glyphicon-remove-sign:before { + content: "\e083"; +} +.tw-bs .glyphicon-ok-sign:before { + content: "\e084"; +} +.tw-bs .glyphicon-question-sign:before { + content: "\e085"; +} +.tw-bs .glyphicon-info-sign:before { + content: "\e086"; +} +.tw-bs .glyphicon-screenshot:before { + content: "\e087"; +} +.tw-bs .glyphicon-remove-circle:before { + content: "\e088"; +} +.tw-bs .glyphicon-ok-circle:before { + content: "\e089"; +} +.tw-bs .glyphicon-ban-circle:before { + content: "\e090"; +} +.tw-bs .glyphicon-arrow-left:before { + content: "\e091"; +} +.tw-bs .glyphicon-arrow-right:before { + content: "\e092"; +} +.tw-bs .glyphicon-arrow-up:before { + content: "\e093"; +} +.tw-bs .glyphicon-arrow-down:before { + content: "\e094"; +} +.tw-bs .glyphicon-share-alt:before { + content: "\e095"; +} +.tw-bs .glyphicon-resize-full:before { + content: "\e096"; +} +.tw-bs .glyphicon-resize-small:before { + content: "\e097"; +} +.tw-bs .glyphicon-exclamation-sign:before { + content: "\e101"; +} +.tw-bs .glyphicon-gift:before { + content: "\e102"; +} +.tw-bs .glyphicon-leaf:before { + content: "\e103"; +} +.tw-bs .glyphicon-eye-open:before { + content: "\e105"; +} +.tw-bs .glyphicon-eye-close:before { + content: "\e106"; +} +.tw-bs .glyphicon-warning-sign:before { + content: "\e107"; +} +.tw-bs .glyphicon-plane:before { + content: "\e108"; +} +.tw-bs .glyphicon-random:before { + content: "\e110"; +} +.tw-bs .glyphicon-comment:before { + content: "\e111"; +} +.tw-bs .glyphicon-magnet:before { + content: "\e112"; +} +.tw-bs .glyphicon-chevron-up:before { + content: "\e113"; +} +.tw-bs .glyphicon-chevron-down:before { + content: "\e114"; +} +.tw-bs .glyphicon-retweet:before { + content: "\e115"; +} +.tw-bs .glyphicon-shopping-cart:before { + content: "\e116"; +} +.tw-bs .glyphicon-folder-close:before { + content: "\e117"; +} +.tw-bs .glyphicon-folder-open:before { + content: "\e118"; +} +.tw-bs .glyphicon-resize-vertical:before { + content: "\e119"; +} +.tw-bs .glyphicon-resize-horizontal:before { + content: "\e120"; +} +.tw-bs .glyphicon-hdd:before { + content: "\e121"; +} +.tw-bs .glyphicon-bullhorn:before { + content: "\e122"; +} +.tw-bs .glyphicon-certificate:before { + content: "\e124"; +} +.tw-bs .glyphicon-thumbs-up:before { + content: "\e125"; +} +.tw-bs .glyphicon-thumbs-down:before { + content: "\e126"; +} +.tw-bs .glyphicon-hand-right:before { + content: "\e127"; +} +.tw-bs .glyphicon-hand-left:before { + content: "\e128"; +} +.tw-bs .glyphicon-hand-up:before { + content: "\e129"; +} +.tw-bs .glyphicon-hand-down:before { + content: "\e130"; +} +.tw-bs .glyphicon-circle-arrow-right:before { + content: "\e131"; +} +.tw-bs .glyphicon-circle-arrow-left:before { + content: "\e132"; +} +.tw-bs .glyphicon-circle-arrow-up:before { + content: "\e133"; +} +.tw-bs .glyphicon-circle-arrow-down:before { + content: "\e134"; +} +.tw-bs .glyphicon-globe:before { + content: "\e135"; +} +.tw-bs .glyphicon-tasks:before { + content: "\e137"; +} +.tw-bs .glyphicon-filter:before { + content: "\e138"; +} +.tw-bs .glyphicon-fullscreen:before { + content: "\e140"; +} +.tw-bs .glyphicon-dashboard:before { + content: "\e141"; +} +.tw-bs .glyphicon-heart-empty:before { + content: "\e143"; +} +.tw-bs .glyphicon-link:before { + content: "\e144"; +} +.tw-bs .glyphicon-phone:before { + content: "\e145"; +} +.tw-bs .glyphicon-usd:before { + content: "\e148"; +} +.tw-bs .glyphicon-gbp:before { + content: "\e149"; +} +.tw-bs .glyphicon-sort:before { + content: "\e150"; +} +.tw-bs .glyphicon-sort-by-alphabet:before { + content: "\e151"; +} +.tw-bs .glyphicon-sort-by-alphabet-alt:before { + content: "\e152"; +} +.tw-bs .glyphicon-sort-by-order:before { + content: "\e153"; +} +.tw-bs .glyphicon-sort-by-order-alt:before { + content: "\e154"; +} +.tw-bs .glyphicon-sort-by-attributes:before { + content: "\e155"; +} +.tw-bs .glyphicon-sort-by-attributes-alt:before { + content: "\e156"; +} +.tw-bs .glyphicon-unchecked:before { + content: "\e157"; +} +.tw-bs .glyphicon-expand:before { + content: "\e158"; +} +.tw-bs .glyphicon-collapse-down:before { + content: "\e159"; +} +.tw-bs .glyphicon-collapse-up:before { + content: "\e160"; +} +.tw-bs .glyphicon-log-in:before { + content: "\e161"; +} +.tw-bs .glyphicon-flash:before { + content: "\e162"; +} +.tw-bs .glyphicon-log-out:before { + content: "\e163"; +} +.tw-bs .glyphicon-new-window:before { + content: "\e164"; +} +.tw-bs .glyphicon-record:before { + content: "\e165"; +} +.tw-bs .glyphicon-save:before { + content: "\e166"; +} +.tw-bs .glyphicon-open:before { + content: "\e167"; +} +.tw-bs .glyphicon-saved:before { + content: "\e168"; +} +.tw-bs .glyphicon-import:before { + content: "\e169"; +} +.tw-bs .glyphicon-export:before { + content: "\e170"; +} +.tw-bs .glyphicon-send:before { + content: "\e171"; +} +.tw-bs .glyphicon-floppy-disk:before { + content: "\e172"; +} +.tw-bs .glyphicon-floppy-saved:before { + content: "\e173"; +} +.tw-bs .glyphicon-floppy-remove:before { + content: "\e174"; +} +.tw-bs .glyphicon-floppy-save:before { + content: "\e175"; +} +.tw-bs .glyphicon-floppy-open:before { + content: "\e176"; +} +.tw-bs .glyphicon-credit-card:before { + content: "\e177"; +} +.tw-bs .glyphicon-transfer:before { + content: "\e178"; +} +.tw-bs .glyphicon-cutlery:before { + content: "\e179"; +} +.tw-bs .glyphicon-header:before { + content: "\e180"; +} +.tw-bs .glyphicon-compressed:before { + content: "\e181"; +} +.tw-bs .glyphicon-earphone:before { + content: "\e182"; +} +.tw-bs .glyphicon-phone-alt:before { + content: "\e183"; +} +.tw-bs .glyphicon-tower:before { + content: "\e184"; +} +.tw-bs .glyphicon-stats:before { + content: "\e185"; +} +.tw-bs .glyphicon-sd-video:before { + content: "\e186"; +} +.tw-bs .glyphicon-hd-video:before { + content: "\e187"; +} +.tw-bs .glyphicon-subtitles:before { + content: "\e188"; +} +.tw-bs .glyphicon-sound-stereo:before { + content: "\e189"; +} +.tw-bs .glyphicon-sound-dolby:before { + content: "\e190"; +} +.tw-bs .glyphicon-sound-5-1:before { + content: "\e191"; +} +.tw-bs .glyphicon-sound-6-1:before { + content: "\e192"; +} +.tw-bs .glyphicon-sound-7-1:before { + content: "\e193"; +} +.tw-bs .glyphicon-copyright-mark:before { + content: "\e194"; +} +.tw-bs .glyphicon-registration-mark:before { + content: "\e195"; +} +.tw-bs .glyphicon-cloud-download:before { + content: "\e197"; +} +.tw-bs .glyphicon-cloud-upload:before { + content: "\e198"; +} +.tw-bs .glyphicon-tree-conifer:before { + content: "\e199"; +} +.tw-bs .glyphicon-tree-deciduous:before { + content: "\e200"; +} +.tw-bs .glyphicon-briefcase:before { + content: "\1f4bc"; +} +.tw-bs .glyphicon-calendar:before { + content: "\1f4c5"; +} +.tw-bs .glyphicon-pushpin:before { + content: "\1f4cc"; +} +.tw-bs .glyphicon-paperclip:before { + content: "\1f4ce"; +} +.tw-bs .glyphicon-camera:before { + content: "\1f4f7"; +} +.tw-bs .glyphicon-lock:before { + content: "\1f512"; +} +.tw-bs .glyphicon-bell:before { + content: "\1f514"; +} +.tw-bs .glyphicon-bookmark:before { + content: "\1f516"; +} +.tw-bs .glyphicon-fire:before { + content: "\1f525"; +} +.tw-bs .glyphicon-wrench:before { + content: "\1f527"; +} +.tw-bs .caret { + display: inline-block; + width: 0; + height: 0; + margin-left: 2px; + vertical-align: middle; + border-top: 4px solid #000000; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + border-bottom: 0 dotted; + content: ""; +} +.tw-bs .dropdown { + position: relative; +} +.tw-bs .dropdown-toggle:focus { + outline: 0; +} +.tw-bs .dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + font-size: 14px; + background-color: #ffffff; + border: 1px solid #cccccc; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + background-clip: padding-box; +} +.tw-bs .dropdown-menu.pull-right { + right: 0; + left: auto; +} +.tw-bs .dropdown-menu .divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.tw-bs .dropdown-menu > li > a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.428571429; + color: #333333; + white-space: nowrap; +} +.tw-bs .dropdown-menu > li > a:hover, +.tw-bs .dropdown-menu > li > a:focus { + text-decoration: none; + color: #ffffff; + background-color: #428bca; +} +.tw-bs .dropdown-menu > .active > a, +.tw-bs .dropdown-menu > .active > a:hover, +.tw-bs .dropdown-menu > .active > a:focus { + color: #ffffff; + text-decoration: none; + outline: 0; + background-color: #428bca; +} +.tw-bs .dropdown-menu > .disabled > a, +.tw-bs .dropdown-menu > .disabled > a:hover, +.tw-bs .dropdown-menu > .disabled > a:focus { + color: #999999; +} +.tw-bs .dropdown-menu > .disabled > a:hover, +.tw-bs .dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: not-allowed; +} +.tw-bs .open > .dropdown-menu { + display: block; +} +.tw-bs .open > a { + outline: 0; +} +.tw-bs .dropdown-header { + display: block; + padding: 3px 20px; + font-size: 12px; + line-height: 1.428571429; + color: #999999; +} +.tw-bs .dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: 990; +} +.tw-bs .pull-right > .dropdown-menu { + right: 0; + left: auto; +} +.tw-bs .dropup .caret, +.tw-bs .navbar-fixed-bottom .dropdown .caret { + border-top: 0 dotted; + border-bottom: 4px solid #000000; + content: ""; +} +.tw-bs .dropup .dropdown-menu, +.tw-bs .navbar-fixed-bottom .dropdown .dropdown-menu { + top: auto; + bottom: 100%; + margin-bottom: 1px; +} +@media (min-width: 768px) { + .tw-bs .navbar-right .dropdown-menu { + right: 0; + left: auto; + } +} +.btn-default .tw-bs .caret { + border-top-color: #333333; +} +.btn-primary .tw-bs .caret, +.btn-success .tw-bs .caret, +.btn-warning .tw-bs .caret, +.btn-danger .tw-bs .caret, +.btn-info .tw-bs .caret { + border-top-color: #fff; +} +.tw-bs .dropup .btn-default .caret { + border-bottom-color: #333333; +} +.tw-bs .dropup .btn-primary .caret, +.tw-bs .dropup .btn-success .caret, +.tw-bs .dropup .btn-warning .caret, +.tw-bs .dropup .btn-danger .caret, +.tw-bs .dropup .btn-info .caret { + border-bottom-color: #fff; +} +.tw-bs .btn-group, +.tw-bs .btn-group-vertical { + position: relative; + display: inline-block; + vertical-align: middle; +} +.tw-bs .btn-group > .btn, +.tw-bs .btn-group-vertical > .btn { + position: relative; + float: left; +} +.tw-bs .btn-group > .btn:hover, +.tw-bs .btn-group-vertical > .btn:hover, +.tw-bs .btn-group > .btn:focus, +.tw-bs .btn-group-vertical > .btn:focus, +.tw-bs .btn-group > .btn:active, +.tw-bs .btn-group-vertical > .btn:active, +.tw-bs .btn-group > .btn.active, +.tw-bs .btn-group-vertical > .btn.active { + z-index: 2; +} +.tw-bs .btn-group > .btn:focus, +.tw-bs .btn-group-vertical > .btn:focus { + outline: none; +} +.tw-bs .btn-group .btn + .btn, +.tw-bs .btn-group .btn + .btn-group, +.tw-bs .btn-group .btn-group + .btn, +.tw-bs .btn-group .btn-group + .btn-group { + margin-left: -1px; +} +.tw-bs .btn-toolbar:before, +.tw-bs .btn-toolbar:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .btn-toolbar:after { + clear: both; +} +.tw-bs .btn-toolbar:before, +.tw-bs .btn-toolbar:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .btn-toolbar:after { + clear: both; +} +.tw-bs .btn-toolbar .btn-group { + float: left; +} +.tw-bs .btn-toolbar > .btn + .btn, +.tw-bs .btn-toolbar > .btn-group + .btn, +.tw-bs .btn-toolbar > .btn + .btn-group, +.tw-bs .btn-toolbar > .btn-group + .btn-group { + margin-left: 5px; +} +.tw-bs .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { + border-radius: 0; +} +.tw-bs .btn-group > .btn:first-child { + margin-left: 0; +} +.tw-bs .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.tw-bs .btn-group > .btn:last-child:not(:first-child), +.tw-bs .btn-group > .dropdown-toggle:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .btn-group > .btn-group { + float: left; +} +.tw-bs .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.tw-bs .btn-group > .btn-group:first-child > .btn:last-child, +.tw-bs .btn-group > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.tw-bs .btn-group > .btn-group:last-child > .btn:first-child { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .btn-group .dropdown-toggle:active, +.tw-bs .btn-group.open .dropdown-toggle { + outline: 0; +} +.tw-bs .btn-group-xs > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; + padding: 1px 5px; +} +.tw-bs .btn-group-sm > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.tw-bs .btn-group-lg > .btn { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.tw-bs .btn-group > .btn + .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; +} +.tw-bs .btn-group > .btn-lg + .dropdown-toggle { + padding-left: 12px; + padding-right: 12px; +} +.tw-bs .btn-group.open .dropdown-toggle { + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.tw-bs .btn .caret { + margin-left: 0; +} +.tw-bs .btn-lg .caret { + border-width: 5px 5px 0; + border-bottom-width: 0; +} +.tw-bs .dropup .btn-lg .caret { + border-width: 0 5px 5px; +} +.tw-bs .btn-group-vertical > .btn, +.tw-bs .btn-group-vertical > .btn-group { + display: block; + float: none; + width: 100%; + max-width: 100%; +} +.tw-bs .btn-group-vertical > .btn-group:before, +.tw-bs .btn-group-vertical > .btn-group:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .btn-group-vertical > .btn-group:after { + clear: both; +} +.tw-bs .btn-group-vertical > .btn-group:before, +.tw-bs .btn-group-vertical > .btn-group:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .btn-group-vertical > .btn-group:after { + clear: both; +} +.tw-bs .btn-group-vertical > .btn-group > .btn { + float: none; +} +.tw-bs .btn-group-vertical > .btn + .btn, +.tw-bs .btn-group-vertical > .btn + .btn-group, +.tw-bs .btn-group-vertical > .btn-group + .btn, +.tw-bs .btn-group-vertical > .btn-group + .btn-group { + margin-top: -1px; + margin-left: 0; +} +.tw-bs .btn-group-vertical > .btn:not(:first-child):not(:last-child) { + border-radius: 0; +} +.tw-bs .btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-right-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.tw-bs .btn-group-vertical > .btn:last-child:not(:first-child) { + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.tw-bs .btn-group-vertical > .btn-group:first-child > .btn:last-child, +.tw-bs .btn-group-vertical > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.tw-bs .btn-group-vertical > .btn-group:last-child > .btn:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .btn-group-justified { + display: table; + width: 100%; + table-layout: fixed; + border-collapse: separate; +} +.tw-bs .btn-group-justified .btn { + float: none; + display: table-cell; + width: 1%; +} +.tw-bs [data-toggle="buttons"] > .btn > input[type="radio"], +.tw-bs [data-toggle="buttons"] > .btn > input[type="checkbox"] { + display: none; +} +.tw-bs .input-group { + position: relative; + display: table; + border-collapse: separate; +} +.tw-bs .input-group.col { + float: none; + padding-left: 0; + padding-right: 0; +} +.tw-bs .input-group .form-control { + width: 100%; + margin-bottom: 0; +} +.tw-bs .input-group-lg > .form-control, +.tw-bs .input-group-lg > .input-group-addon, +.tw-bs .input-group-lg > .input-group-btn > .btn { + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +select.tw-bs .input-group-lg > .form-control, +select.tw-bs .input-group-lg > .input-group-addon, +select.tw-bs .input-group-lg > .input-group-btn > .btn { + height: 45px; + line-height: 45px; +} +textarea.tw-bs .input-group-lg > .form-control, +textarea.tw-bs .input-group-lg > .input-group-addon, +textarea.tw-bs .input-group-lg > .input-group-btn > .btn { + height: auto; +} +.tw-bs .input-group-sm > .form-control, +.tw-bs .input-group-sm > .input-group-addon, +.tw-bs .input-group-sm > .input-group-btn > .btn { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.tw-bs .input-group-sm > .form-control, +select.tw-bs .input-group-sm > .input-group-addon, +select.tw-bs .input-group-sm > .input-group-btn > .btn { + height: 30px; + line-height: 30px; +} +textarea.tw-bs .input-group-sm > .form-control, +textarea.tw-bs .input-group-sm > .input-group-addon, +textarea.tw-bs .input-group-sm > .input-group-btn > .btn { + height: auto; +} +.tw-bs .input-group-addon, +.tw-bs .input-group-btn, +.tw-bs .input-group .form-control { + display: table-cell; +} +.tw-bs .input-group-addon:not(:first-child):not(:last-child), +.tw-bs .input-group-btn:not(:first-child):not(:last-child), +.tw-bs .input-group .form-control:not(:first-child):not(:last-child) { + border-radius: 0; +} +.tw-bs .input-group-addon, +.tw-bs .input-group-btn { + width: 1%; + white-space: nowrap; + vertical-align: middle; +} +.tw-bs .input-group-addon { + padding: 6px 12px; + font-size: 14px; + font-weight: normal; + line-height: 1; + text-align: center; + background-color: #eeeeee; + border: 1px solid #cccccc; + border-radius: 4px; +} +.tw-bs .input-group-addon.input-sm { + padding: 5px 10px; + font-size: 12px; + border-radius: 3px; +} +.tw-bs .input-group-addon.input-lg { + padding: 10px 16px; + font-size: 18px; + border-radius: 6px; +} +.tw-bs .input-group-addon input[type="radio"], +.tw-bs .input-group-addon input[type="checkbox"] { + margin-top: 0; +} +.tw-bs .input-group .form-control:first-child, +.tw-bs .input-group-addon:first-child, +.tw-bs .input-group-btn:first-child > .btn, +.tw-bs .input-group-btn:first-child > .dropdown-toggle, +.tw-bs .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.tw-bs .input-group-addon:first-child { + border-right: 0; +} +.tw-bs .input-group .form-control:last-child, +.tw-bs .input-group-addon:last-child, +.tw-bs .input-group-btn:last-child > .btn, +.tw-bs .input-group-btn:last-child > .dropdown-toggle, +.tw-bs .input-group-btn:first-child > .btn:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .input-group-addon:last-child { + border-left: 0; +} +.tw-bs .input-group-btn { + position: relative; + white-space: nowrap; +} +.tw-bs .input-group-btn > .btn { + position: relative; +} +.tw-bs .input-group-btn > .btn + .btn { + margin-left: -4px; +} +.tw-bs .input-group-btn > .btn:hover, +.tw-bs .input-group-btn > .btn:active { + z-index: 2; +} +.tw-bs .nav { + margin-bottom: 0; + padding-left: 0; + list-style: none; +} +.tw-bs .nav:before, +.tw-bs .nav:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .nav:after { + clear: both; +} +.tw-bs .nav:before, +.tw-bs .nav:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .nav:after { + clear: both; +} +.tw-bs .nav > li { + position: relative; + display: block; +} +.tw-bs .nav > li > a { + position: relative; + display: block; + padding: 10px 15px; +} +.tw-bs .nav > li > a:hover, +.tw-bs .nav > li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} +.tw-bs .nav > li.disabled > a { + color: #999999; +} +.tw-bs .nav > li.disabled > a:hover, +.tw-bs .nav > li.disabled > a:focus { + color: #999999; + text-decoration: none; + background-color: transparent; + cursor: not-allowed; +} +.tw-bs .nav .open > a, +.tw-bs .nav .open > a:hover, +.tw-bs .nav .open > a:focus { + background-color: #eeeeee; + border-color: #428bca; +} +.tw-bs .nav .nav-divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.tw-bs .nav > li > a > img { + max-width: none; +} +.tw-bs .nav-tabs { + border-bottom: 1px solid #dddddd; +} +.tw-bs .nav-tabs > li { + float: left; + margin-bottom: -1px; +} +.tw-bs .nav-tabs > li > a { + margin-right: 2px; + line-height: 1.428571429; + border: 1px solid transparent; + border-radius: 4px 4px 0 0; +} +.tw-bs .nav-tabs > li > a:hover { + border-color: #eeeeee #eeeeee #dddddd; +} +.tw-bs .nav-tabs > li.active > a, +.tw-bs .nav-tabs > li.active > a:hover, +.tw-bs .nav-tabs > li.active > a:focus { + color: #555555; + background-color: #ffffff; + border: 1px solid #dddddd; + border-bottom-color: transparent; + cursor: default; +} +.tw-bs .nav-tabs.nav-justified { + width: 100%; + border-bottom: 0; +} +.tw-bs .nav-tabs.nav-justified > li { + float: none; +} +.tw-bs .nav-tabs.nav-justified > li > a { + text-align: center; +} +@media (min-width: 768px) { + .tw-bs .nav-tabs.nav-justified > li { + display: table-cell; + width: 1%; + } +} +.tw-bs .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #dddddd; + margin-right: 0; +} +.tw-bs .nav-tabs.nav-justified > .active > a { + border-bottom-color: #ffffff; +} +.tw-bs .nav-pills > li { + float: left; +} +.tw-bs .nav-pills > li > a { + border-radius: 5px; +} +.tw-bs .nav-pills > li + li { + margin-left: 2px; +} +.tw-bs .nav-pills > li.active > a, +.tw-bs .nav-pills > li.active > a:hover, +.tw-bs .nav-pills > li.active > a:focus { + color: #ffffff; + background-color: #428bca; +} +.tw-bs .nav-stacked > li { + float: none; +} +.tw-bs .nav-stacked > li + li { + margin-top: 2px; + margin-left: 0; +} +.tw-bs .nav-justified { + width: 100%; +} +.tw-bs .nav-justified > li { + float: none; +} +.tw-bs .nav-justified > li > a { + text-align: center; +} +@media (min-width: 768px) { + .tw-bs .nav-justified > li { + display: table-cell; + width: 1%; + } +} +.tw-bs .nav-tabs-justified { + border-bottom: 0; +} +.tw-bs .nav-tabs-justified > li > a { + border-bottom: 1px solid #dddddd; + margin-right: 0; +} +.tw-bs .nav-tabs-justified > .active > a { + border-bottom-color: #ffffff; +} +.tw-bs .tabbable:before, +.tw-bs .tabbable:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .tabbable:after { + clear: both; +} +.tw-bs .tabbable:before, +.tw-bs .tabbable:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .tabbable:after { + clear: both; +} +.tw-bs .tab-content > .tab-pane, +.tw-bs .pill-content > .pill-pane { + display: none; +} +.tw-bs .tab-content > .active, +.tw-bs .pill-content > .active { + display: block; +} +.tw-bs .nav .caret { + border-top-color: #428bca; + border-bottom-color: #428bca; +} +.tw-bs .nav a:hover .caret { + border-top-color: #2a6496; + border-bottom-color: #2a6496; +} +.tw-bs .nav-tabs .dropdown-menu { + margin-top: -1px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .navbar { + position: relative; + z-index: 1000; + min-height: 50px; + margin-bottom: 20px; + border: 1px solid transparent; +} +.tw-bs .navbar:before, +.tw-bs .navbar:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .navbar:after { + clear: both; +} +.tw-bs .navbar:before, +.tw-bs .navbar:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .navbar:after { + clear: both; +} +@media (min-width: 768px) { + .tw-bs .navbar { + border-radius: 4px; + } +} +.tw-bs .navbar-header:before, +.tw-bs .navbar-header:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .navbar-header:after { + clear: both; +} +.tw-bs .navbar-header:before, +.tw-bs .navbar-header:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .navbar-header:after { + clear: both; +} +@media (min-width: 768px) { + .tw-bs .navbar-header { + float: left; + } +} +.tw-bs .navbar-collapse { + max-height: 340px; + overflow-x: visible; + padding-right: 15px; + padding-left: 15px; + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-overflow-scrolling: touch; +} +.tw-bs .navbar-collapse:before, +.tw-bs .navbar-collapse:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .navbar-collapse:after { + clear: both; +} +.tw-bs .navbar-collapse:before, +.tw-bs .navbar-collapse:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .navbar-collapse:after { + clear: both; +} +.tw-bs .navbar-collapse.in { + overflow-y: auto; +} +@media (min-width: 768px) { + .tw-bs .navbar-collapse { + width: auto; + border-top: 0; + box-shadow: none; + } + .tw-bs .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } + .tw-bs .navbar-collapse.in { + overflow-y: visible; + } + .tw-bs .navbar-collapse .navbar-nav.navbar-left:first-child { + margin-left: -15px; + } + .tw-bs .navbar-collapse .navbar-nav.navbar-right:last-child { + margin-right: -15px; + } + .tw-bs .navbar-collapse .navbar-text:last-child { + margin-right: 0; + } +} +.tw-bs .container > .navbar-header, +.tw-bs .container > .navbar-collapse { + margin-right: -15px; + margin-left: -15px; +} +@media (min-width: 768px) { + .tw-bs .container > .navbar-header, + .tw-bs .container > .navbar-collapse { + margin-right: 0; + margin-left: 0; + } +} +.tw-bs .navbar-static-top { + border-width: 0 0 1px; +} +@media (min-width: 768px) { + .tw-bs .navbar-static-top { + border-radius: 0; + } +} +.tw-bs .navbar-fixed-top, +.tw-bs .navbar-fixed-bottom { + position: fixed; + right: 0; + left: 0; + border-width: 0 0 1px; +} +@media (min-width: 768px) { + .tw-bs .navbar-fixed-top, + .tw-bs .navbar-fixed-bottom { + border-radius: 0; + } +} +.tw-bs .navbar-fixed-top { + z-index: 1030; + top: 0; +} +.tw-bs .navbar-fixed-bottom { + bottom: 0; + margin-bottom: 0; +} +.tw-bs .navbar-brand { + float: left; + padding: 15px 15px; + font-size: 18px; + line-height: 20px; +} +.tw-bs .navbar-brand:hover, +.tw-bs .navbar-brand:focus { + text-decoration: none; +} +@media (min-width: 768px) { + .navbar > .container .tw-bs .navbar-brand { + margin-left: -15px; + } +} +.tw-bs .navbar-toggle { + position: relative; + float: right; + margin-right: 15px; + padding: 9px 10px; + margin-top: 8px; + margin-bottom: 8px; + background-color: transparent; + border: 1px solid transparent; + border-radius: 4px; +} +.tw-bs .navbar-toggle .icon-bar { + display: block; + width: 22px; + height: 2px; + border-radius: 1px; +} +.tw-bs .navbar-toggle .icon-bar + .icon-bar { + margin-top: 4px; +} +@media (min-width: 768px) { + .tw-bs .navbar-toggle { + display: none; + } +} +.tw-bs .navbar-nav { + margin: 7.5px -15px; +} +.tw-bs .navbar-nav > li > a { + padding-top: 10px; + padding-bottom: 10px; + line-height: 20px; +} +@media (max-width: 767px) { + .tw-bs .navbar-nav .open .dropdown-menu { + position: static; + float: none; + width: auto; + margin-top: 0; + background-color: transparent; + border: 0; + box-shadow: none; + } + .tw-bs .navbar-nav .open .dropdown-menu > li > a, + .tw-bs .navbar-nav .open .dropdown-menu .dropdown-header { + padding: 5px 15px 5px 25px; + } + .tw-bs .navbar-nav .open .dropdown-menu > li > a { + line-height: 20px; + } + .tw-bs .navbar-nav .open .dropdown-menu > li > a:hover, + .tw-bs .navbar-nav .open .dropdown-menu > li > a:focus { + background-image: none; + } +} +@media (min-width: 768px) { + .tw-bs .navbar-nav { + float: left; + margin: 0; + } + .tw-bs .navbar-nav > li { + float: left; + } + .tw-bs .navbar-nav > li > a { + padding-top: 15px; + padding-bottom: 15px; + } +} +@media (min-width: 768px) { + .tw-bs .navbar-left { + float: left !important; + } + .tw-bs .navbar-right { + float: right !important; + } +} +.tw-bs .navbar-form { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + margin-top: 8px; + margin-bottom: 8px; +} +@media (min-width: 768px) { + .tw-bs .navbar-form .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .tw-bs .navbar-form .form-control { + display: inline-block; + } + .tw-bs .navbar-form .radio, + .tw-bs .navbar-form .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + padding-left: 0; + } + .tw-bs .navbar-form .radio input[type="radio"], + .tw-bs .navbar-form .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } +} +@media (max-width: 767px) { + .tw-bs .navbar-form .form-group { + margin-bottom: 5px; + } +} +@media (min-width: 768px) { + .tw-bs .navbar-form { + width: auto; + border: 0; + margin-left: 0; + margin-right: 0; + padding-top: 0; + padding-bottom: 0; + -webkit-box-shadow: none; + box-shadow: none; + } +} +.tw-bs .navbar-nav > li > .dropdown-menu { + margin-top: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.tw-bs .navbar-nav.pull-right > li > .dropdown-menu, +.tw-bs .navbar-nav > li > .dropdown-menu.pull-right { + left: auto; + right: 0; +} +.tw-bs .navbar-btn { + margin-top: 8px; + margin-bottom: 8px; +} +.tw-bs .navbar-text { + float: left; + margin-top: 15px; + margin-bottom: 15px; +} +@media (min-width: 768px) { + .tw-bs .navbar-text { + margin-left: 15px; + margin-right: 15px; + } +} +.tw-bs .navbar-default { + background-color: #f8f8f8; + border-color: #e7e7e7; +} +.tw-bs .navbar-default .navbar-brand { + color: #777777; +} +.tw-bs .navbar-default .navbar-brand:hover, +.tw-bs .navbar-default .navbar-brand:focus { + color: #5e5e5e; + background-color: transparent; +} +.tw-bs .navbar-default .navbar-text { + color: #777777; +} +.tw-bs .navbar-default .navbar-nav > li > a { + color: #777777; +} +.tw-bs .navbar-default .navbar-nav > li > a:hover, +.tw-bs .navbar-default .navbar-nav > li > a:focus { + color: #333333; + background-color: transparent; +} +.tw-bs .navbar-default .navbar-nav > .active > a, +.tw-bs .navbar-default .navbar-nav > .active > a:hover, +.tw-bs .navbar-default .navbar-nav > .active > a:focus { + color: #555555; + background-color: #e7e7e7; +} +.tw-bs .navbar-default .navbar-nav > .disabled > a, +.tw-bs .navbar-default .navbar-nav > .disabled > a:hover, +.tw-bs .navbar-default .navbar-nav > .disabled > a:focus { + color: #cccccc; + background-color: transparent; +} +.tw-bs .navbar-default .navbar-toggle { + border-color: #dddddd; +} +.tw-bs .navbar-default .navbar-toggle:hover, +.tw-bs .navbar-default .navbar-toggle:focus { + background-color: #dddddd; +} +.tw-bs .navbar-default .navbar-toggle .icon-bar { + background-color: #cccccc; +} +.tw-bs .navbar-default .navbar-collapse, +.tw-bs .navbar-default .navbar-form { + border-color: #e6e6e6; +} +.tw-bs .navbar-default .navbar-nav > .dropdown > a:hover .caret, +.tw-bs .navbar-default .navbar-nav > .dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; +} +.tw-bs .navbar-default .navbar-nav > .open > a, +.tw-bs .navbar-default .navbar-nav > .open > a:hover, +.tw-bs .navbar-default .navbar-nav > .open > a:focus { + background-color: #e7e7e7; + color: #555555; +} +.tw-bs .navbar-default .navbar-nav > .open > a .caret, +.tw-bs .navbar-default .navbar-nav > .open > a:hover .caret, +.tw-bs .navbar-default .navbar-nav > .open > a:focus .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.tw-bs .navbar-default .navbar-nav > .dropdown > a .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +@media (max-width: 767px) { + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #777777; + } + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #333333; + background-color: transparent; + } + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #555555; + background-color: #e7e7e7; + } + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .tw-bs .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #cccccc; + background-color: transparent; + } +} +.tw-bs .navbar-default .navbar-link { + color: #777777; +} +.tw-bs .navbar-default .navbar-link:hover { + color: #333333; +} +.tw-bs .navbar-inverse { + background-color: #222222; + border-color: #080808; +} +.tw-bs .navbar-inverse .navbar-brand { + color: #999999; +} +.tw-bs .navbar-inverse .navbar-brand:hover, +.tw-bs .navbar-inverse .navbar-brand:focus { + color: #ffffff; + background-color: transparent; +} +.tw-bs .navbar-inverse .navbar-text { + color: #999999; +} +.tw-bs .navbar-inverse .navbar-nav > li > a { + color: #999999; +} +.tw-bs .navbar-inverse .navbar-nav > li > a:hover, +.tw-bs .navbar-inverse .navbar-nav > li > a:focus { + color: #ffffff; + background-color: transparent; +} +.tw-bs .navbar-inverse .navbar-nav > .active > a, +.tw-bs .navbar-inverse .navbar-nav > .active > a:hover, +.tw-bs .navbar-inverse .navbar-nav > .active > a:focus { + color: #ffffff; + background-color: #080808; +} +.tw-bs .navbar-inverse .navbar-nav > .disabled > a, +.tw-bs .navbar-inverse .navbar-nav > .disabled > a:hover, +.tw-bs .navbar-inverse .navbar-nav > .disabled > a:focus { + color: #444444; + background-color: transparent; +} +.tw-bs .navbar-inverse .navbar-toggle { + border-color: #333333; +} +.tw-bs .navbar-inverse .navbar-toggle:hover, +.tw-bs .navbar-inverse .navbar-toggle:focus { + background-color: #333333; +} +.tw-bs .navbar-inverse .navbar-toggle .icon-bar { + background-color: #ffffff; +} +.tw-bs .navbar-inverse .navbar-collapse, +.tw-bs .navbar-inverse .navbar-form { + border-color: #101010; +} +.tw-bs .navbar-inverse .navbar-nav > .open > a, +.tw-bs .navbar-inverse .navbar-nav > .open > a:hover, +.tw-bs .navbar-inverse .navbar-nav > .open > a:focus { + background-color: #080808; + color: #ffffff; +} +.tw-bs .navbar-inverse .navbar-nav > .dropdown > a:hover .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.tw-bs .navbar-inverse .navbar-nav > .dropdown > a .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.tw-bs .navbar-inverse .navbar-nav > .open > a .caret, +.tw-bs .navbar-inverse .navbar-nav > .open > a:hover .caret, +.tw-bs .navbar-inverse .navbar-nav > .open > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +@media (max-width: 767px) { + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { + border-color: #080808; + } + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { + color: #999999; + } + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { + color: #ffffff; + background-color: transparent; + } + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #ffffff; + background-color: #080808; + } + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .tw-bs .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #444444; + background-color: transparent; + } +} +.tw-bs .navbar-inverse .navbar-link { + color: #999999; +} +.tw-bs .navbar-inverse .navbar-link:hover { + color: #ffffff; +} +.tw-bs .breadcrumb { + padding: 8px 15px; + margin-bottom: 20px; + list-style: none; + background-color: #f5f5f5; + border-radius: 4px; +} +.tw-bs .breadcrumb > li { + display: inline-block; +} +.tw-bs .breadcrumb > li + li:before { + content: "/\00a0"; + padding: 0 5px; + color: #cccccc; +} +.tw-bs .breadcrumb > .active { + color: #999999; +} +.tw-bs .pagination { + display: inline-block; + padding-left: 0; + margin: 20px 0; + border-radius: 4px; +} +.tw-bs .pagination > li { + display: inline; +} +.tw-bs .pagination > li > a, +.tw-bs .pagination > li > span { + position: relative; + float: left; + padding: 6px 12px; + line-height: 1.428571429; + text-decoration: none; + background-color: #ffffff; + border: 1px solid #dddddd; + margin-left: -1px; +} +.tw-bs .pagination > li:first-child > a, +.tw-bs .pagination > li:first-child > span { + margin-left: 0; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} +.tw-bs .pagination > li:last-child > a, +.tw-bs .pagination > li:last-child > span { + border-bottom-right-radius: 4px; + border-top-right-radius: 4px; +} +.tw-bs .pagination > li > a:hover, +.tw-bs .pagination > li > span:hover, +.tw-bs .pagination > li > a:focus, +.tw-bs .pagination > li > span:focus { + background-color: #eeeeee; +} +.tw-bs .pagination > .active > a, +.tw-bs .pagination > .active > span, +.tw-bs .pagination > .active > a:hover, +.tw-bs .pagination > .active > span:hover, +.tw-bs .pagination > .active > a:focus, +.tw-bs .pagination > .active > span:focus { + z-index: 2; + color: #ffffff; + background-color: #428bca; + border-color: #428bca; + cursor: default; +} +.tw-bs .pagination > .disabled > span, +.tw-bs .pagination > .disabled > a, +.tw-bs .pagination > .disabled > a:hover, +.tw-bs .pagination > .disabled > a:focus { + color: #999999; + background-color: #ffffff; + border-color: #dddddd; + cursor: not-allowed; +} +.tw-bs .pagination-lg > li > a, +.tw-bs .pagination-lg > li > span { + padding: 10px 16px; + font-size: 18px; +} +.tw-bs .pagination-lg > li:first-child > a, +.tw-bs .pagination-lg > li:first-child > span { + border-bottom-left-radius: 6px; + border-top-left-radius: 6px; +} +.tw-bs .pagination-lg > li:last-child > a, +.tw-bs .pagination-lg > li:last-child > span { + border-bottom-right-radius: 6px; + border-top-right-radius: 6px; +} +.tw-bs .pagination-sm > li > a, +.tw-bs .pagination-sm > li > span { + padding: 5px 10px; + font-size: 12px; +} +.tw-bs .pagination-sm > li:first-child > a, +.tw-bs .pagination-sm > li:first-child > span { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; +} +.tw-bs .pagination-sm > li:last-child > a, +.tw-bs .pagination-sm > li:last-child > span { + border-bottom-right-radius: 3px; + border-top-right-radius: 3px; +} +.tw-bs .pager { + padding-left: 0; + margin: 20px 0; + list-style: none; + text-align: center; +} +.tw-bs .pager:before, +.tw-bs .pager:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .pager:after { + clear: both; +} +.tw-bs .pager:before, +.tw-bs .pager:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .pager:after { + clear: both; +} +.tw-bs .pager li { + display: inline; +} +.tw-bs .pager li > a, +.tw-bs .pager li > span { + display: inline-block; + padding: 5px 14px; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 15px; +} +.tw-bs .pager li > a:hover, +.tw-bs .pager li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} +.tw-bs .pager .next > a, +.tw-bs .pager .next > span { + float: right; +} +.tw-bs .pager .previous > a, +.tw-bs .pager .previous > span { + float: left; +} +.tw-bs .pager .disabled > a, +.tw-bs .pager .disabled > a:hover, +.tw-bs .pager .disabled > a:focus, +.tw-bs .pager .disabled > span { + color: #999999; + background-color: #ffffff; + cursor: not-allowed; +} +.tw-bs .label { + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: bold; + line-height: 1; + color: #ffffff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} +.tw-bs .label[href]:hover, +.tw-bs .label[href]:focus { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.tw-bs .label:empty { + display: none; +} +.tw-bs .label-default { + background-color: #999999; +} +.tw-bs .label-default[href]:hover, +.tw-bs .label-default[href]:focus { + background-color: #808080; +} +.tw-bs .label-primary { + background-color: #428bca; +} +.tw-bs .label-primary[href]:hover, +.tw-bs .label-primary[href]:focus { + background-color: #3071a9; +} +.tw-bs .label-success { + background-color: #5cb85c; +} +.tw-bs .label-success[href]:hover, +.tw-bs .label-success[href]:focus { + background-color: #449d44; +} +.tw-bs .label-info { + background-color: #5bc0de; +} +.tw-bs .label-info[href]:hover, +.tw-bs .label-info[href]:focus { + background-color: #31b0d5; +} +.tw-bs .label-warning { + background-color: #f0ad4e; +} +.tw-bs .label-warning[href]:hover, +.tw-bs .label-warning[href]:focus { + background-color: #ec971f; +} +.tw-bs .label-danger { + background-color: #d9534f; +} +.tw-bs .label-danger[href]:hover, +.tw-bs .label-danger[href]:focus { + background-color: #c9302c; +} +.tw-bs .badge { + display: inline-block; + min-width: 10px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + color: #ffffff; + line-height: 1; + vertical-align: baseline; + white-space: nowrap; + text-align: center; + background-color: #999999; + border-radius: 10px; +} +.tw-bs .badge:empty { + display: none; +} +.tw-bs a.badge:hover, +.tw-bs a.badge:focus { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.tw-bs .btn .badge { + position: relative; + top: -1px; +} +.tw-bs a.list-group-item.active > .badge, +.tw-bs .nav-pills > .active > a > .badge { + color: #428bca; + background-color: #ffffff; +} +.tw-bs .nav-pills > li > a > .badge { + margin-left: 3px; +} +.tw-bs .jumbotron { + padding: 30px; + margin-bottom: 30px; + font-size: 21px; + font-weight: 200; + line-height: 2.1428571435; + color: inherit; + background-color: #eeeeee; +} +.tw-bs .jumbotron h1 { + line-height: 1; + color: inherit; +} +.tw-bs .jumbotron p { + line-height: 1.4; +} +.container .tw-bs .jumbotron { + border-radius: 6px; +} +@media screen and (min-width: 768px) { + .tw-bs .jumbotron { + padding-top: 48px; + padding-bottom: 48px; + } + .container .tw-bs .jumbotron { + padding-left: 60px; + padding-right: 60px; + } + .tw-bs .jumbotron h1 { + font-size: 63px; + } +} +.tw-bs .thumbnail { + padding: 4px; + line-height: 1.428571429; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; + display: block; +} +.tw-bs .thumbnail > img { + display: block; + max-width: 100%; + height: auto; +} +.tw-bs a.thumbnail:hover, +.tw-bs a.thumbnail:focus { + border-color: #428bca; +} +.tw-bs .thumbnail > img { + margin-left: auto; + margin-right: auto; +} +.tw-bs .thumbnail .caption { + padding: 9px; + color: #333333; +} +.tw-bs .alert { + padding: 15px; + margin-bottom: 20px; + border: 1px solid transparent; + border-radius: 4px; +} +.tw-bs .alert h4 { + margin-top: 0; + color: inherit; +} +.tw-bs .alert .alert-link { + font-weight: bold; +} +.tw-bs .alert > p, +.tw-bs .alert > ul { + margin-bottom: 0; +} +.tw-bs .alert > p + p { + margin-top: 5px; +} +.tw-bs .alert-dismissable { + padding-right: 35px; +} +.tw-bs .alert-dismissable .close { + position: relative; + top: -2px; + right: -21px; + color: inherit; +} +.tw-bs .alert-success { + background-color: #dff0d8; + border-color: #d6e9c6; + color: #468847; +} +.tw-bs .alert-success hr { + border-top-color: #c9e2b3; +} +.tw-bs .alert-success .alert-link { + color: #356635; +} +.tw-bs .alert-info { + background-color: #d9edf7; + border-color: #bce8f1; + color: #3a87ad; +} +.tw-bs .alert-info hr { + border-top-color: #a6e1ec; +} +.tw-bs .alert-info .alert-link { + color: #2d6987; +} +.tw-bs .alert-warning { + background-color: #fcf8e3; + border-color: #fbeed5; + color: #c09853; +} +.tw-bs .alert-warning hr { + border-top-color: #f8e5be; +} +.tw-bs .alert-warning .alert-link { + color: #a47e3c; +} +.tw-bs .alert-danger { + background-color: #f2dede; + border-color: #eed3d7; + color: #b94a48; +} +.tw-bs .alert-danger hr { + border-top-color: #e6c1c7; +} +.tw-bs .alert-danger .alert-link { + color: #953b39; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +@-moz-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +@-o-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +.tw-bs .progress { + overflow: hidden; + height: 20px; + margin-bottom: 20px; + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} +.tw-bs .progress-bar { + float: left; + width: 0%; + height: 100%; + font-size: 12px; + color: #ffffff; + text-align: center; + background-color: #428bca; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.tw-bs .progress-striped .progress-bar { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-size: 40px 40px; +} +.tw-bs .progress.active .progress-bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.tw-bs .progress-bar-success { + background-color: #5cb85c; +} +.progress-striped .tw-bs .progress-bar-success { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.tw-bs .progress-bar-info { + background-color: #5bc0de; +} +.progress-striped .tw-bs .progress-bar-info { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.tw-bs .progress-bar-warning { + background-color: #f0ad4e; +} +.progress-striped .tw-bs .progress-bar-warning { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.tw-bs .progress-bar-danger { + background-color: #d9534f; +} +.progress-striped .tw-bs .progress-bar-danger { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.tw-bs .media, +.tw-bs .media-body { + overflow: hidden; + zoom: 1; +} +.tw-bs .media, +.tw-bs .media .media { + margin-top: 15px; +} +.tw-bs .media:first-child { + margin-top: 0; +} +.tw-bs .media-object { + display: block; +} +.tw-bs .media-heading { + margin: 0 0 5px; +} +.tw-bs .media > .pull-left { + margin-right: 10px; +} +.tw-bs .media > .pull-right { + margin-left: 10px; +} +.tw-bs .media-list { + padding-left: 0; + list-style: none; +} +.tw-bs .list-group { + margin-bottom: 20px; + padding-left: 0; +} +.tw-bs .list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #ffffff; + border: 1px solid #dddddd; +} +.tw-bs .list-group-item:first-child { + border-top-right-radius: 4px; + border-top-left-radius: 4px; +} +.tw-bs .list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} +.tw-bs .list-group-item > .badge { + float: right; +} +.tw-bs .list-group-item > .badge + .badge { + margin-right: 5px; +} +a.tw-bs .list-group-item { + color: #555555; +} +a.tw-bs .list-group-item .list-group-item-heading { + color: #333333; +} +a.tw-bs .list-group-item:hover, +a.tw-bs .list-group-item:focus { + text-decoration: none; + background-color: #f5f5f5; +} +.tw-bs .list-group-item.active, +.tw-bs .list-group-item.active:hover, +.tw-bs .list-group-item.active:focus { + z-index: 2; + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} +.tw-bs .list-group-item.active .list-group-item-heading, +.tw-bs .list-group-item.active:hover .list-group-item-heading, +.tw-bs .list-group-item.active:focus .list-group-item-heading { + color: inherit; +} +.tw-bs .list-group-item.active .list-group-item-text, +.tw-bs .list-group-item.active:hover .list-group-item-text, +.tw-bs .list-group-item.active:focus .list-group-item-text { + color: #e1edf7; +} +.tw-bs .list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} +.tw-bs .list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} +.tw-bs .panel { + margin-bottom: 20px; + background-color: #ffffff; + border: 1px solid transparent; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); +} +.tw-bs .panel-body { + padding: 15px; +} +.tw-bs .panel-body:before, +.tw-bs .panel-body:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .panel-body:after { + clear: both; +} +.tw-bs .panel-body:before, +.tw-bs .panel-body:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .panel-body:after { + clear: both; +} +.tw-bs .panel > .list-group { + margin-bottom: 0; +} +.tw-bs .panel > .list-group .list-group-item { + border-width: 1px 0; +} +.tw-bs .panel > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.tw-bs .panel > .list-group .list-group-item:last-child { + border-bottom: 0; +} +.tw-bs .panel-heading + .list-group .list-group-item:first-child { + border-top-width: 0; +} +.tw-bs .panel > .table { + margin-bottom: 0; +} +.tw-bs .panel > .panel-body + .table { + border-top: 1px solid #dddddd; +} +.tw-bs .panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} +.tw-bs .panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: 16px; +} +.tw-bs .panel-title > a { + color: inherit; +} +.tw-bs .panel-footer { + padding: 10px 15px; + background-color: #f5f5f5; + border-top: 1px solid #dddddd; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} +.tw-bs .panel-group .panel { + margin-bottom: 0; + border-radius: 4px; + overflow: hidden; +} +.tw-bs .panel-group .panel + .panel { + margin-top: 5px; +} +.tw-bs .panel-group .panel-heading { + border-bottom: 0; +} +.tw-bs .panel-group .panel-heading + .panel-collapse .panel-body { + border-top: 1px solid #dddddd; +} +.tw-bs .panel-group .panel-footer { + border-top: 0; +} +.tw-bs .panel-group .panel-footer + .panel-collapse .panel-body { + border-bottom: 1px solid #dddddd; +} +.tw-bs .panel-default { + border-color: #dddddd; +} +.tw-bs .panel-default > .panel-heading { + color: #333333; + background-color: #f5f5f5; + border-color: #dddddd; +} +.tw-bs .panel-default > .panel-heading + .panel-collapse .panel-body { + border-top-color: #dddddd; +} +.tw-bs .panel-default > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #dddddd; +} +.tw-bs .panel-primary { + border-color: #428bca; +} +.tw-bs .panel-primary > .panel-heading { + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} +.tw-bs .panel-primary > .panel-heading + .panel-collapse .panel-body { + border-top-color: #428bca; +} +.tw-bs .panel-primary > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #428bca; +} +.tw-bs .panel-success { + border-color: #d6e9c6; +} +.tw-bs .panel-success > .panel-heading { + color: #468847; + background-color: #dff0d8; + border-color: #d6e9c6; +} +.tw-bs .panel-success > .panel-heading + .panel-collapse .panel-body { + border-top-color: #d6e9c6; +} +.tw-bs .panel-success > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #d6e9c6; +} +.tw-bs .panel-warning { + border-color: #fbeed5; +} +.tw-bs .panel-warning > .panel-heading { + color: #c09853; + background-color: #fcf8e3; + border-color: #fbeed5; +} +.tw-bs .panel-warning > .panel-heading + .panel-collapse .panel-body { + border-top-color: #fbeed5; +} +.tw-bs .panel-warning > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #fbeed5; +} +.tw-bs .panel-danger { + border-color: #eed3d7; +} +.tw-bs .panel-danger > .panel-heading { + color: #b94a48; + background-color: #f2dede; + border-color: #eed3d7; +} +.tw-bs .panel-danger > .panel-heading + .panel-collapse .panel-body { + border-top-color: #eed3d7; +} +.tw-bs .panel-danger > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #eed3d7; +} +.tw-bs .panel-info { + border-color: #bce8f1; +} +.tw-bs .panel-info > .panel-heading { + color: #3a87ad; + background-color: #d9edf7; + border-color: #bce8f1; +} +.tw-bs .panel-info > .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} +.tw-bs .panel-info > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} +.tw-bs .well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.tw-bs .well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.tw-bs .well-lg { + padding: 24px; + border-radius: 6px; +} +.tw-bs .well-sm { + padding: 9px; + border-radius: 3px; +} +.tw-bs .close { + float: right; + font-size: 21px; + font-weight: bold; + line-height: 1; + color: #000000; + text-shadow: 0 1px 0 #ffffff; + opacity: 0.2; + filter: alpha(opacity=20); +} +.tw-bs .close:hover, +.tw-bs .close:focus { + color: #000000; + text-decoration: none; + cursor: pointer; + opacity: 0.5; + filter: alpha(opacity=50); +} +button.tw-bs .close { + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; +} +.tw-bs .modal-open { + overflow: hidden; +} +body.tw-bs .modal-open, +.tw-bs .modal-open .navbar-fixed-top, +.tw-bs .modal-open .navbar-fixed-bottom { + margin-right: 15px; +} +.tw-bs .modal { + display: none; + overflow: auto; + overflow-y: scroll; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; +} +.tw-bs .modal.fade .modal-dialog { + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); + -webkit-transition: -webkit-transform 0.3s ease-out; + -moz-transition: -moz-transform 0.3s ease-out; + -o-transition: -o-transform 0.3s ease-out; + transition: transform 0.3s ease-out; +} +.tw-bs .modal.in .modal-dialog { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); +} +.tw-bs .modal-dialog { + margin-left: auto; + margin-right: auto; + width: auto; + padding: 10px; + z-index: 1050; +} +.tw-bs .modal-content { + position: relative; + background-color: #ffffff; + border: 1px solid #999999; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + background-clip: padding-box; + outline: none; +} +.tw-bs .modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1030; + background-color: #000000; +} +.tw-bs .modal-backdrop.fade { + opacity: 0; + filter: alpha(opacity=0); +} +.tw-bs .modal-backdrop.in { + opacity: 0.5; + filter: alpha(opacity=50); +} +.tw-bs .modal-header { + padding: 15px; + border-bottom: 1px solid #e5e5e5; + min-height: 16.428571429px; +} +.tw-bs .modal-header .close { + margin-top: -2px; +} +.tw-bs .modal-title { + margin: 0; + line-height: 1.428571429; +} +.tw-bs .modal-body { + position: relative; + padding: 20px; +} +.tw-bs .modal-footer { + margin-top: 15px; + padding: 19px 20px 20px; + text-align: right; + border-top: 1px solid #e5e5e5; +} +.tw-bs .modal-footer:before, +.tw-bs .modal-footer:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .modal-footer:after { + clear: both; +} +.tw-bs .modal-footer:before, +.tw-bs .modal-footer:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .modal-footer:after { + clear: both; +} +.tw-bs .modal-footer .btn + .btn { + margin-left: 5px; + margin-bottom: 0; +} +.tw-bs .modal-footer .btn-group .btn + .btn { + margin-left: -1px; +} +.tw-bs .modal-footer .btn-block + .btn-block { + margin-left: 0; +} +@media screen and (min-width: 768px) { + .tw-bs .modal-dialog { + left: 50%; + right: auto; + width: 600px; + padding-top: 30px; + padding-bottom: 30px; + } + .tw-bs .modal-content { + -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); + } +} +.tw-bs .tooltip { + position: absolute; + z-index: 1030; + display: block; + visibility: visible; + font-size: 12px; + line-height: 1.4; + opacity: 0; + filter: alpha(opacity=0); +} +.tw-bs .tooltip.in { + opacity: 0.9; + filter: alpha(opacity=90); +} +.tw-bs .tooltip.top { + margin-top: -3px; + padding: 5px 0; +} +.tw-bs .tooltip.right { + margin-left: 3px; + padding: 0 5px; +} +.tw-bs .tooltip.bottom { + margin-top: 3px; + padding: 5px 0; +} +.tw-bs .tooltip.left { + margin-left: -3px; + padding: 0 5px; +} +.tw-bs .tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: #ffffff; + text-align: center; + text-decoration: none; + background-color: #000000; + border-radius: 4px; +} +.tw-bs .tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tw-bs .tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tw-bs .tooltip.top-left .tooltip-arrow { + bottom: 0; + left: 5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tw-bs .tooltip.top-right .tooltip-arrow { + bottom: 0; + right: 5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tw-bs .tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-width: 5px 5px 5px 0; + border-right-color: #000000; +} +.tw-bs .tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-width: 5px 0 5px 5px; + border-left-color: #000000; +} +.tw-bs .tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; +} +.tw-bs .tooltip.bottom-left .tooltip-arrow { + top: 0; + left: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; +} +.tw-bs .tooltip.bottom-right .tooltip-arrow { + top: 0; + right: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; +} +.tw-bs .popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + background-clip: padding-box; + border: 1px solid #cccccc; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; +} +.tw-bs .popover.top { + margin-top: -10px; +} +.tw-bs .popover.right { + margin-left: 10px; +} +.tw-bs .popover.bottom { + margin-top: 10px; +} +.tw-bs .popover.left { + margin-left: -10px; +} +.tw-bs .popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + border-radius: 5px 5px 0 0; +} +.tw-bs .popover-content { + padding: 9px 14px; +} +.tw-bs .popover .arrow, +.tw-bs .popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tw-bs .popover .arrow { + border-width: 11px; +} +.tw-bs .popover .arrow:after { + border-width: 10px; + content: ""; +} +.tw-bs .popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.tw-bs .popover.top .arrow:after { + content: " "; + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; +} +.tw-bs .popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999999; + border-right-color: rgba(0, 0, 0, 0.25); +} +.tw-bs .popover.right .arrow:after { + content: " "; + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; +} +.tw-bs .popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; +} +.tw-bs .popover.bottom .arrow:after { + content: " "; + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; +} +.tw-bs .popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999999; + border-left-color: rgba(0, 0, 0, 0.25); +} +.tw-bs .popover.left .arrow:after { + content: " "; + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; +} +.tw-bs .carousel { + position: relative; +} +.tw-bs .carousel-inner { + position: relative; + overflow: hidden; + width: 100%; +} +.tw-bs .carousel-inner > .item { + display: none; + position: relative; + -webkit-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; +} +.tw-bs .carousel-inner > .item > img, +.tw-bs .carousel-inner > .item > a > img { + display: block; + max-width: 100%; + height: auto; + line-height: 1; +} +.tw-bs .carousel-inner > .active, +.tw-bs .carousel-inner > .next, +.tw-bs .carousel-inner > .prev { + display: block; +} +.tw-bs .carousel-inner > .active { + left: 0; +} +.tw-bs .carousel-inner > .next, +.tw-bs .carousel-inner > .prev { + position: absolute; + top: 0; + width: 100%; +} +.tw-bs .carousel-inner > .next { + left: 100%; +} +.tw-bs .carousel-inner > .prev { + left: -100%; +} +.tw-bs .carousel-inner > .next.left, +.tw-bs .carousel-inner > .prev.right { + left: 0; +} +.tw-bs .carousel-inner > .active.left { + left: -100%; +} +.tw-bs .carousel-inner > .active.right { + left: 100%; +} +.tw-bs .carousel-control { + position: absolute; + top: 0; + left: 0; + bottom: 0; + width: 15%; + opacity: 0.5; + filter: alpha(opacity=50); + font-size: 20px; + color: #ffffff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); +} +.tw-bs .carousel-control.left { + background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); + background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0%), color-stop(rgba(0, 0, 0, 0.0001) 100%)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); +} +.tw-bs .carousel-control.right { + left: auto; + right: 0; + background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); + background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0%), color-stop(rgba(0, 0, 0, 0.5) 100%)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); +} +.tw-bs .carousel-control:hover, +.tw-bs .carousel-control:focus { + color: #ffffff; + text-decoration: none; + opacity: 0.9; + filter: alpha(opacity=90); +} +.tw-bs .carousel-control .icon-prev, +.tw-bs .carousel-control .icon-next, +.tw-bs .carousel-control .glyphicon-chevron-left, +.tw-bs .carousel-control .glyphicon-chevron-right { + position: absolute; + top: 50%; + left: 50%; + z-index: 5; + display: inline-block; +} +.tw-bs .carousel-control .icon-prev, +.tw-bs .carousel-control .icon-next { + width: 20px; + height: 20px; + margin-top: -10px; + margin-left: -10px; + font-family: serif; +} +.tw-bs .carousel-control .icon-prev:before { + content: '\2039'; +} +.tw-bs .carousel-control .icon-next:before { + content: '\203a'; +} +.tw-bs .carousel-indicators { + position: absolute; + bottom: 10px; + left: 50%; + z-index: 15; + width: 60%; + margin-left: -30%; + padding-left: 0; + list-style: none; + text-align: center; +} +.tw-bs .carousel-indicators li { + display: inline-block; + width: 10px; + height: 10px; + margin: 1px; + text-indent: -999px; + border: 1px solid #ffffff; + border-radius: 10px; + cursor: pointer; +} +.tw-bs .carousel-indicators .active { + margin: 0; + width: 12px; + height: 12px; + background-color: #ffffff; +} +.tw-bs .carousel-caption { + position: absolute; + left: 15%; + right: 15%; + bottom: 20px; + z-index: 10; + padding-top: 20px; + padding-bottom: 20px; + color: #ffffff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); +} +.tw-bs .carousel-caption .btn { + text-shadow: none; +} +@media screen and (min-width: 768px) { + .tw-bs .carousel-control .icon-prev, + .tw-bs .carousel-control .icon-next { + width: 30px; + height: 30px; + margin-top: -15px; + margin-left: -15px; + font-size: 30px; + } + .tw-bs .carousel-caption { + left: 20%; + right: 20%; + padding-bottom: 30px; + } + .tw-bs .carousel-indicators { + bottom: 20px; + } +} +.tw-bs .clearfix:before, +.tw-bs .clearfix:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ +} +.tw-bs .clearfix:after { + clear: both; +} +.tw-bs .pull-right { + float: right !important; +} +.tw-bs .pull-left { + float: left !important; +} +.tw-bs .hide { + display: none !important; +} +.tw-bs .show { + display: block !important; +} +.tw-bs .invisible { + visibility: hidden; +} +.tw-bs .text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} +.tw-bs .affix { + position: fixed; +} +@-ms-viewport { + width: device-width; +} +@media screen and (max-width: 400px) { + @-ms-viewport { + width: 320px; + } +} +.tw-bs .hidden { + display: none !important; + visibility: hidden !important; +} +.tw-bs .visible-xs { + display: none !important; +} +tr.tw-bs .visible-xs { + display: none !important; +} +th.tw-bs .visible-xs, +td.tw-bs .visible-xs { + display: none !important; +} +@media (max-width: 767px) { + .tw-bs .visible-xs { + display: block !important; + } + tr.tw-bs .visible-xs { + display: table-row !important; + } + th.tw-bs .visible-xs, + td.tw-bs .visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .visible-xs.visible-sm { + display: block !important; + } + tr.tw-bs .visible-xs.visible-sm { + display: table-row !important; + } + th.tw-bs .visible-xs.visible-sm, + td.tw-bs .visible-xs.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .visible-xs.visible-md { + display: block !important; + } + tr.tw-bs .visible-xs.visible-md { + display: table-row !important; + } + th.tw-bs .visible-xs.visible-md, + td.tw-bs .visible-xs.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .tw-bs .visible-xs.visible-lg { + display: block !important; + } + tr.tw-bs .visible-xs.visible-lg { + display: table-row !important; + } + th.tw-bs .visible-xs.visible-lg, + td.tw-bs .visible-xs.visible-lg { + display: table-cell !important; + } +} +.tw-bs .visible-sm { + display: none !important; +} +tr.tw-bs .visible-sm { + display: none !important; +} +th.tw-bs .visible-sm, +td.tw-bs .visible-sm { + display: none !important; +} +@media (max-width: 767px) { + .tw-bs .visible-sm.visible-xs { + display: block !important; + } + tr.tw-bs .visible-sm.visible-xs { + display: table-row !important; + } + th.tw-bs .visible-sm.visible-xs, + td.tw-bs .visible-sm.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .visible-sm { + display: block !important; + } + tr.tw-bs .visible-sm { + display: table-row !important; + } + th.tw-bs .visible-sm, + td.tw-bs .visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .visible-sm.visible-md { + display: block !important; + } + tr.tw-bs .visible-sm.visible-md { + display: table-row !important; + } + th.tw-bs .visible-sm.visible-md, + td.tw-bs .visible-sm.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .tw-bs .visible-sm.visible-lg { + display: block !important; + } + tr.tw-bs .visible-sm.visible-lg { + display: table-row !important; + } + th.tw-bs .visible-sm.visible-lg, + td.tw-bs .visible-sm.visible-lg { + display: table-cell !important; + } +} +.tw-bs .visible-md { + display: none !important; +} +tr.tw-bs .visible-md { + display: none !important; +} +th.tw-bs .visible-md, +td.tw-bs .visible-md { + display: none !important; +} +@media (max-width: 767px) { + .tw-bs .visible-md.visible-xs { + display: block !important; + } + tr.tw-bs .visible-md.visible-xs { + display: table-row !important; + } + th.tw-bs .visible-md.visible-xs, + td.tw-bs .visible-md.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .visible-md.visible-sm { + display: block !important; + } + tr.tw-bs .visible-md.visible-sm { + display: table-row !important; + } + th.tw-bs .visible-md.visible-sm, + td.tw-bs .visible-md.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .visible-md { + display: block !important; + } + tr.tw-bs .visible-md { + display: table-row !important; + } + th.tw-bs .visible-md, + td.tw-bs .visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .tw-bs .visible-md.visible-lg { + display: block !important; + } + tr.tw-bs .visible-md.visible-lg { + display: table-row !important; + } + th.tw-bs .visible-md.visible-lg, + td.tw-bs .visible-md.visible-lg { + display: table-cell !important; + } +} +.tw-bs .visible-lg { + display: none !important; +} +tr.tw-bs .visible-lg { + display: none !important; +} +th.tw-bs .visible-lg, +td.tw-bs .visible-lg { + display: none !important; +} +@media (max-width: 767px) { + .tw-bs .visible-lg.visible-xs { + display: block !important; + } + tr.tw-bs .visible-lg.visible-xs { + display: table-row !important; + } + th.tw-bs .visible-lg.visible-xs, + td.tw-bs .visible-lg.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .visible-lg.visible-sm { + display: block !important; + } + tr.tw-bs .visible-lg.visible-sm { + display: table-row !important; + } + th.tw-bs .visible-lg.visible-sm, + td.tw-bs .visible-lg.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .visible-lg.visible-md { + display: block !important; + } + tr.tw-bs .visible-lg.visible-md { + display: table-row !important; + } + th.tw-bs .visible-lg.visible-md, + td.tw-bs .visible-lg.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .tw-bs .visible-lg { + display: block !important; + } + tr.tw-bs .visible-lg { + display: table-row !important; + } + th.tw-bs .visible-lg, + td.tw-bs .visible-lg { + display: table-cell !important; + } +} +.tw-bs .hidden-xs { + display: block !important; +} +tr.tw-bs .hidden-xs { + display: table-row !important; +} +th.tw-bs .hidden-xs, +td.tw-bs .hidden-xs { + display: table-cell !important; +} +@media (max-width: 767px) { + .tw-bs .hidden-xs { + display: none !important; + } + tr.tw-bs .hidden-xs { + display: none !important; + } + th.tw-bs .hidden-xs, + td.tw-bs .hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .hidden-xs.hidden-sm { + display: none !important; + } + tr.tw-bs .hidden-xs.hidden-sm { + display: none !important; + } + th.tw-bs .hidden-xs.hidden-sm, + td.tw-bs .hidden-xs.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .hidden-xs.hidden-md { + display: none !important; + } + tr.tw-bs .hidden-xs.hidden-md { + display: none !important; + } + th.tw-bs .hidden-xs.hidden-md, + td.tw-bs .hidden-xs.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .tw-bs .hidden-xs.hidden-lg { + display: none !important; + } + tr.tw-bs .hidden-xs.hidden-lg { + display: none !important; + } + th.tw-bs .hidden-xs.hidden-lg, + td.tw-bs .hidden-xs.hidden-lg { + display: none !important; + } +} +.tw-bs .hidden-sm { + display: block !important; +} +tr.tw-bs .hidden-sm { + display: table-row !important; +} +th.tw-bs .hidden-sm, +td.tw-bs .hidden-sm { + display: table-cell !important; +} +@media (max-width: 767px) { + .tw-bs .hidden-sm.hidden-xs { + display: none !important; + } + tr.tw-bs .hidden-sm.hidden-xs { + display: none !important; + } + th.tw-bs .hidden-sm.hidden-xs, + td.tw-bs .hidden-sm.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .hidden-sm { + display: none !important; + } + tr.tw-bs .hidden-sm { + display: none !important; + } + th.tw-bs .hidden-sm, + td.tw-bs .hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .hidden-sm.hidden-md { + display: none !important; + } + tr.tw-bs .hidden-sm.hidden-md { + display: none !important; + } + th.tw-bs .hidden-sm.hidden-md, + td.tw-bs .hidden-sm.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .tw-bs .hidden-sm.hidden-lg { + display: none !important; + } + tr.tw-bs .hidden-sm.hidden-lg { + display: none !important; + } + th.tw-bs .hidden-sm.hidden-lg, + td.tw-bs .hidden-sm.hidden-lg { + display: none !important; + } +} +.tw-bs .hidden-md { + display: block !important; +} +tr.tw-bs .hidden-md { + display: table-row !important; +} +th.tw-bs .hidden-md, +td.tw-bs .hidden-md { + display: table-cell !important; +} +@media (max-width: 767px) { + .tw-bs .hidden-md.hidden-xs { + display: none !important; + } + tr.tw-bs .hidden-md.hidden-xs { + display: none !important; + } + th.tw-bs .hidden-md.hidden-xs, + td.tw-bs .hidden-md.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .hidden-md.hidden-sm { + display: none !important; + } + tr.tw-bs .hidden-md.hidden-sm { + display: none !important; + } + th.tw-bs .hidden-md.hidden-sm, + td.tw-bs .hidden-md.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .hidden-md { + display: none !important; + } + tr.tw-bs .hidden-md { + display: none !important; + } + th.tw-bs .hidden-md, + td.tw-bs .hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .tw-bs .hidden-md.hidden-lg { + display: none !important; + } + tr.tw-bs .hidden-md.hidden-lg { + display: none !important; + } + th.tw-bs .hidden-md.hidden-lg, + td.tw-bs .hidden-md.hidden-lg { + display: none !important; + } +} +.tw-bs .hidden-lg { + display: block !important; +} +tr.tw-bs .hidden-lg { + display: table-row !important; +} +th.tw-bs .hidden-lg, +td.tw-bs .hidden-lg { + display: table-cell !important; +} +@media (max-width: 767px) { + .tw-bs .hidden-lg.hidden-xs { + display: none !important; + } + tr.tw-bs .hidden-lg.hidden-xs { + display: none !important; + } + th.tw-bs .hidden-lg.hidden-xs, + td.tw-bs .hidden-lg.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .tw-bs .hidden-lg.hidden-sm { + display: none !important; + } + tr.tw-bs .hidden-lg.hidden-sm { + display: none !important; + } + th.tw-bs .hidden-lg.hidden-sm, + td.tw-bs .hidden-lg.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .tw-bs .hidden-lg.hidden-md { + display: none !important; + } + tr.tw-bs .hidden-lg.hidden-md { + display: none !important; + } + th.tw-bs .hidden-lg.hidden-md, + td.tw-bs .hidden-lg.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .tw-bs .hidden-lg { + display: none !important; + } + tr.tw-bs .hidden-lg { + display: none !important; + } + th.tw-bs .hidden-lg, + td.tw-bs .hidden-lg { + display: none !important; + } +} +.tw-bs .visible-print { + display: none !important; +} +tr.tw-bs .visible-print { + display: none !important; +} +th.tw-bs .visible-print, +td.tw-bs .visible-print { + display: none !important; +} +@media print { + .tw-bs .visible-print { + display: block !important; + } + tr.tw-bs .visible-print { + display: table-row !important; + } + th.tw-bs .visible-print, + td.tw-bs .visible-print { + display: table-cell !important; + } + .tw-bs .hidden-print { + display: none !important; + } + tr.tw-bs .hidden-print { + display: none !important; + } + th.tw-bs .hidden-print, + td.tw-bs .hidden-print { + display: none !important; + } +} From 360863bf84871a1819f9e95ad06209ce9e98424d Mon Sep 17 00:00:00 2001 From: Chih-Shao Date: Tue, 3 Dec 2013 17:02:01 -0800 Subject: [PATCH 105/107] Improve search function performance --- .../grading_queue_for_course.html.erb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/views/deliverables/grading_queue_for_course.html.erb b/app/views/deliverables/grading_queue_for_course.html.erb index 1a1f7c907..45972ef9e 100644 --- a/app/views/deliverables/grading_queue_for_course.html.erb +++ b/app/views/deliverables/grading_queue_for_course.html.erb @@ -111,7 +111,7 @@ - - - - - - - +