Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

extracted images for each institution to be uploaded

  • Loading branch information...
commit bffc9e33c1ad8500f236672ebfc087fbae4b6cc4 1 parent 36cf329
@agrobbin authored
View
2  .gitignore
@@ -4,4 +4,4 @@
db/*.sqlite3
log/*.log
tmp/
-public/documents
+public/uploads
View
2  app/controllers/sessions_controller.rb
@@ -30,7 +30,7 @@ def oauth_callback
end
def destroy
- cookies.delete(:user_id)
+ session.delete(:user_id)
redirect_to new_session_path and return
end
View
4 app/models/document.rb
@@ -7,6 +7,10 @@ class Document < ActiveRecord::Base
belongs_to :section
belongs_to :assignment
+ has_attached_file :upload,
+ :url => "/uploads/:class/:id/:updated_at_folder/:filename",
+ :path => ":rails_root/public:url"
+
before_create :set_defaults
protected
View
7 app/models/institution.rb
@@ -1,4 +1,5 @@
class Institution < ActiveRecord::Base
+ include Uclass::App::Uploads
has_many :users
has_many :professors
@@ -6,6 +7,12 @@ class Institution < ActiveRecord::Base
has_many :students
has_many :courses
+ has_attached_file :upload,
+ :styles => { :logo => "60x60>", :tutorial => "125x94>" },
+ :convert_options => { :tutorial => '\( -colorspace Gray +clone \) -append' },
+ :url => "/uploads/:class/:id/:updated_at_folder/:style.:extension",
+ :path => ":rails_root/public:url"
+
validates_presence_of :name, :subdomain, :email_domain
validates_uniqueness_of :subdomain
View
7 app/models/upload.rb
@@ -3,5 +3,12 @@ class Upload < ActiveRecord::Base
belongs_to :user
belongs_to :resource, :polymorphic => true
+
+ has_attached_file :upload,
+ :styles => { :normal => "250x250>", :thumb => "100x100>" },
+ :url => "/uploads/:class/:id/:updated_at_folder/:style_folder/:filename",
+ :path => ":rails_root/public:url"
+
+ before_post_process :image?
end
View
2  app/views/layouts/institutions.haml
@@ -27,7 +27,7 @@
#well
#header
= link_to 'uClass', root_path, :id => 'uclass', :class => 'logo left'
- = link_to current_institution.name, root_path, :id => 'logo', :class => 'logo left'
+ = link_to current_institution.name, root_path, :id => 'logo', :class => 'logo left', :style => "background-image: url(#{current_institution.upload.url(:logo)});"
- if signed_in?
#welcome.right
Welcome back, #{current_user.first_name}
View
2  app/views/sessions/tutorial.haml
@@ -2,7 +2,7 @@
.header
%h2
= link_to '#', :class => 'step-1 active' do
- %span
+ %span{:style => "background-image: url(#{current_institution.upload.url(:tutorial)});"}
%b Sign In
.header
%h2
View
2  app/views/users/setup.haml
@@ -1,6 +1,6 @@
:javascript
$(function(){
- setTimeout(function({
+ setTimeout(function(){
$.ajax({
url: '/user/setup/calendar',
type: 'POST',
View
8 config/initializers/paperclip.rb
@@ -1,5 +1,9 @@
-Paperclip.interpolates :folders do |attachment, style_name|
- "#{attachment.instance.updated_at.to_s(:number)}/#{style_name.to_s.split("_").collect {|w| w.first}.join}"
+Paperclip.interpolates :updated_at_folder do |attachment, style_name|
+ attachment.instance.updated_at.to_s(:number)
+end
+
+Paperclip.interpolates :style_folder do |attachment, style_name|
+ style_name.to_s.split("_").collect {|w| w.first}.join
end
Paperclip.interpolates :sha1d_basename do |attachment, style_name|
View
6 db/migrate/20110301010754_create_base.rb
@@ -35,7 +35,6 @@ def self.up
t.text :description
t.string :upload_file_name, :upload_content_type
t.integer :upload_file_size
- t.datetime :upload_updated_at
t.string :google_document_id
t.timestamps
@@ -49,7 +48,9 @@ def self.up
end
create_table :institutions do |t|
- t.string :name, :subdomain, :email_domain
+ t.string :name, :subdomain, :email_domain
+ t.string :upload_file_name, :upload_content_type
+ t.integer :upload_file_size
t.timestamps
end
@@ -122,7 +123,6 @@ def self.up
t.text :description
t.string :upload_file_name, :upload_content_type
t.integer :upload_file_size
- t.datetime :upload_updated_at
t.timestamps
end
View
5 db/schema.rb
@@ -59,7 +59,6 @@
t.string "upload_file_name"
t.string "upload_content_type"
t.integer "upload_file_size"
- t.datetime "upload_updated_at"
t.string "google_document_id"
t.datetime "created_at"
t.datetime "updated_at"
@@ -79,6 +78,9 @@
t.string "name"
t.string "subdomain"
t.string "email_domain"
+ t.string "upload_file_name"
+ t.string "upload_content_type"
+ t.integer "upload_file_size"
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -178,7 +180,6 @@
t.string "upload_file_name"
t.string "upload_content_type"
t.integer "upload_file_size"
- t.datetime "upload_updated_at"
t.datetime "created_at"
t.datetime "updated_at"
end
View
2  db/seeds.rb
@@ -1,5 +1,5 @@
print "Institutions"
-institution = Institution.create(:name => "Bryant University", :subdomain => "bryant", :email_domain => "bryant.edu"); print "."
+institution = Institution.create!(:name => "Bryant University", :subdomain => "bryant", :email_domain => "bryant.edu", :upload => File.new(Rails.root.join('seeds', 'Bryant University.png'))); print "."
print "\nSemesters"
institution.semesters.create(:season => 'Spring', :year => 2011, :start_date => '2011-01-25', :end_date => '2011-05-17', :current => true); print "."
View
BIN  public/images/logo-small.png
Deleted file not rendered
View
BIN  public/images/tutorial-allow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/tutorial-bryant.png
Deleted file not rendered
View
BIN  public/images/tutorial-grant.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
30 public/stylesheets/application.css
@@ -38,9 +38,9 @@ img#uclass-large { position: absolute; }
#loading { position: fixed; bottom: 10px; right: 10px; background: #bbe4ef url(/images/loading.gif) 10px 5px no-repeat; border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; padding: 5px 10px 5px 31px; display: none; z-index: 10; font-size: 12px; font-weight: bold; }
#well { min-width: 980px; padding: 5px 20px 20px; }
-#well a.logo { height: 60px; text-indent: -10000px; display: block; }
-#well a#uclass { background: url(/images/uclass-small.png) no-repeat; width: 217px; padding-right: 25px; }
-#well a#logo { background: url(/images/logo-small.png) no-repeat; width: 60px; }
+#well a.logo { height: 60px; text-indent: -10000px; display: block; background-position: left center; background-repeat: no-repeat; }
+#well a#uclass { background-image: url(/images/uclass-small.png); width: 217px; padding-right: 25px; }
+#well a#logo { width: 60px; }
#well #welcome { margin-top: 10px; width: 225px; text-align: right; color: #fff; font-size: 15px; font-weight: bold; }
#well #welcome a { color: #fff; text-decoration: underline; }
#well #welcome span { display: block; font-size: 13px; font-weight: normal; }
@@ -68,6 +68,14 @@ img#uclass-large { position: absolute; }
.widget .inner h2 span.m a { color: #fff; }
.widget table#calendar td { height: auto; }
+#modal { border-color: #e5e5e5 #dbdbdb #d2d2d2; border-width: 1px; border-style: solid; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25); display: none; position: absolute; min-width: 100px; background: #fff; padding: 10px 15px; z-index: 10; }
+#modal .triangle { width: 39px; height: 10px; background: url(/images/icons/triangle.png) no-repeat; position: absolute; top: -10px; }
+
+#dialog { display: none; z-index: 5; position: fixed; top: 0; width: 100%; height: 100%; background: #000; }
+
+#dialog-content { display: none; z-index: 5; position: absolute; top: 0; left: 0; width: 605px; padding: 20px; background: #fff; margin: 50px auto 10px; -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25); }
+#dialog-content a.close { display: block; height: 21px; width: 68px; background: url(/images/icons/close.gif) top left no-repeat; text-indent: -10000px; margin-top: 25px; }
+
a.section { display: block; color: #000; padding: 6px 10px; font-size: 14px; }
a.section:hover { text-decoration: none; background: #bbe4ef; }
a.section.dark { background: #dcf3f9; }
@@ -126,14 +134,6 @@ a.section .grade { font-weight: bold; }
#gpa { text-align: right; margin: 5px 10px 0 0; }
#gpa span { font-size: 18px; }
-#modal { border-color: #e5e5e5 #dbdbdb #d2d2d2; border-width: 1px; border-style: solid; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25); display: none; position: absolute; min-width: 100px; background: #fff; padding: 10px 15px; z-index: 10; }
-#modal .triangle { width: 39px; height: 10px; background: url(/images/icons/triangle.png) no-repeat; position: absolute; top: -10px; }
-
-#dialog { display: none; z-index: 5; position: fixed; top: 0; width: 100%; height: 100%; background: #000; }
-
-#dialog-content { display: none; z-index: 5; position: absolute; top: 0; left: 0; width: 605px; padding: 20px; background: #fff; margin: 50px auto 10px; -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25); }
-#dialog-content a.close { display: block; height: 21px; width: 68px; background: url(/images/icons/close.gif) top left no-repeat; text-indent: -10000px; margin-top: 25px; }
-
form#new_session { margin: 50px 0; }
form#new_session .left { width: 50%; }
form#new_session .left h1 { text-align: center; }
@@ -146,10 +146,10 @@ form#new_session .left a { display: block; width: 631px; height: 155px; backgrou
#tutorial .header h2 { font-size: 40px; }
#tutorial .header h2 a { color: #7a7a7a; }
#tutorial .header h2 a:hover, #tutorial .header h2 a.active { color: #007cca; text-decoration: none; }
-#tutorial .header h2 a:hover span, #tutorial .header h2 a.active span { background-position: bottom center; }
-#tutorial .header h2 a span { display: block; margin: 0 auto; background-position: top center; background-repeat: no-repeat; }
+#tutorial .header h2 a:hover span, #tutorial .header h2 a.active span { background-position: top center; }
+#tutorial .header h2 a span { display: block; margin: 0 auto; background-position: bottom center; background-repeat: no-repeat; }
#tutorial .header h2 a b { display: block; }
-#tutorial .header h2 a.step-1 span { background-image: url(/images/tutorial-bryant.png); width: 94px; height: 94px; }
+#tutorial .header h2 a.step-1 span { width: 125px; height: 94px; }
#tutorial .header h2 a.step-1 b { padding-top: 10px; }
#tutorial .header h2 a.step-2 span { background-image: url(/images/tutorial-allow.png); width: 119px; height: 84px; margin-top: 5px; }
#tutorial .header h2 a.step-2 b { padding-top: 15px; }
@@ -163,5 +163,5 @@ img#setup-loading { position: absolute; margin: 43px 0 0 110px; }
ul#setup { margin: 50px 0 50px 100px; list-style: none; font-size: 15px; font-style: italic; }
ul#setup li { opacity: 0.5; filter: alpha(opacity=50); margin: 15px 0; padding: 5px 0 5px 40px; background-position: top left; background-repeat: no-repeat; }
ul#setup li.calendar { background-image: url(/images/icons/google-calendar.jpg); }
-ul#setup li.documents { background-image: url(/images/icons/oogle-documents.jpg); }
+ul#setup li.documents { background-image: url(/images/icons/google-documents.jpg); }
ul#setup li.complete { background-image: url(/images/icons/complete.jpg); }
View
70 public/stylesheets/modals.css
@@ -1,70 +0,0 @@
-/*
-Syntax error: Undefined mixin 'border-rounded'.
- on line 2 of public/stylesheets/scss/modals.scss, in `border-rounded'
- from line 2 of public/stylesheets/scss/modals.scss
-
-1: #modal {
-2: @include border-rounded;
-3: -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
-4: -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
-5: filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25);
-6: display: none;
-7: position: absolute;
-
-Backtrace:
-public/stylesheets/scss/modals.scss:2:in `border-rounded'
-public/stylesheets/scss/modals.scss:2
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/mixin_node.rb:62:in `perform!'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:305:in `_perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:213:in `perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:327:in `block in perform_children'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:327:in `map'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:327:in `perform_children'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:317:in `perform!'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/rule_node.rb:191:in `perform!'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:305:in `_perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:213:in `perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:327:in `block in perform_children'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:327:in `map'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:327:in `perform_children'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:317:in `perform!'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/root_node.rb:59:in `perform!'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:305:in `_perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/node.rb:213:in `perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/root_node.rb:37:in `perform'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/tree/root_node.rb:29:in `render'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:223:in `update_stylesheet'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:88:in `block (2 levels) in update_stylesheets'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:81:in `each'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:81:in `block in update_stylesheets'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:79:in `each'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:79:in `update_stylesheets'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:174:in `block (4 levels) in watch'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/path.rb:71:in `call'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/path.rb:71:in `run_callback'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/path.rb:54:in `callback_action'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/path.rb:34:in `update'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/state/directory.rb:32:in `block in modified'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/state/directory.rb:31:in `each'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/state/directory.rb:31:in `modified'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/state/directory.rb:16:in `refresh'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/backends/polling.rb:17:in `block (2 levels) in run'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/backends/polling.rb:17:in `each'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/backends/polling.rb:17:in `block in run'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/backends/polling.rb:15:in `loop'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/backends/polling.rb:15:in `run'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm/monitor.rb:24:in `run'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/vendor/fssm/lib/fssm.rb:17:in `monitor'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/sass/plugin.rb:167:in `watch'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/haml/exec.rb:457:in `watch_or_update'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/haml/exec.rb:360:in `process_result'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/haml/exec.rb:41:in `parse'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/lib/haml/exec.rb:21:in `parse!'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/gems/haml-3.0.25/bin/sass:8:in `<top (required)>'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/bin/sass:19:in `load'
-/Users/alex/.rvm/gems/ruby-1.9.2-p180@uclass/bin/sass:19:in `<main>'
-*/
-body:before {
- white-space: pre;
- font-family: monospace;
- content: "Syntax error: Undefined mixin 'border-rounded'.\A on line 2 of public/stylesheets/scss/modals.scss, in `border-rounded'\A from line 2 of public/stylesheets/scss/modals.scss\A \A 1: #modal {\A 2: @include border-rounded;\A 3: -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px; \A 4: -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;\A 5: filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25);\A 6: display: none;\A 7: position: absolute;"; }
View
60 public/stylesheets/scss/application.scss
@@ -139,14 +139,17 @@ img#uclass-large {
height: 60px;
text-indent: -10000px;
display: block;
+ background: {
+ position: left center;
+ repeat: no-repeat;
+ }
}
a#uclass {
- background: url(/images/uclass-small.png) no-repeat;
+ background-image: url(/images/uclass-small.png);
width: 217px;
padding-right: 25px;
}
a#logo {
- background: url(/images/logo-small.png) no-repeat;
width: 60px;
}
#welcome {
@@ -325,6 +328,58 @@ img#uclass-large {
}
}
+#modal {
+ @include border-rounded;
+ -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
+ -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
+ filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25);
+ display: none;
+ position: absolute;
+ min-width: 100px;
+ background: #fff;
+ padding: 10px 15px;
+ z-index: 10;
+ .triangle {
+ width: 39px;
+ height: 10px;
+ background: url(/images/icons/triangle.png) no-repeat;
+ position: absolute;
+ top: -10px;
+ }
+}
+
+#dialog {
+ display: none;
+ z-index: 5;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background: #000;
+}
+#dialog-content {
+ display: none;
+ z-index: 5;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 605px;
+ padding: 20px;
+ background: #fff;
+ margin: 50px auto 10px;
+ -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
+ -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
+ filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25);
+ a.close {
+ display: block;
+ height: 21px;
+ width: 68px;
+ background: url(/images/icons/close.gif) top left no-repeat;
+ text-indent: -10000px;
+ margin-top: 25px;
+ }
+}
+
a.section {
display: block;
color: #000;
@@ -353,6 +408,5 @@ a.section {
@import "courses";
@import "documents";
@import "institutions";
-@import "modals";
@import "sessions";
@import "users";
View
51 public/stylesheets/scss/modals.scss
@@ -1,51 +0,0 @@
-#modal {
- @include border-rounded;
- -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
- -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
- filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25);
- display: none;
- position: absolute;
- min-width: 100px;
- background: #fff;
- padding: 10px 15px;
- z-index: 10;
- .triangle {
- width: 39px;
- height: 10px;
- background: url(/images/icons/triangle.png) no-repeat;
- position: absolute;
- top: -10px;
- }
-}
-
-#dialog {
- display: none;
- z-index: 5;
- position: fixed;
- top: 0;
- width: 100%;
- height: 100%;
- background: #000;
-}
-#dialog-content {
- display: none;
- z-index: 5;
- position: absolute;
- top: 0;
- left: 0;
- width: 605px;
- padding: 20px;
- background: #fff;
- margin: 50px auto 10px;
- -moz-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
- -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 1px 25px;
- filter: progid:DXImageTransform.Microsoft.Shadow(color=#b2b2b2, direction=125, strength=25);
- a.close {
- display: block;
- height: 21px;
- width: 68px;
- background: url(/images/icons/close.gif) top left no-repeat;
- text-indent: -10000px;
- margin-top: 25px;
- }
-}
View
7 public/stylesheets/scss/sessions.scss
@@ -47,14 +47,14 @@ form#new_session {
color: #007cca;
text-decoration: none;
span {
- background-position: bottom center;
+ background-position: top center;
}
}
span {
display: block;
margin: 0 auto;
background: {
- position: top center;
+ position: bottom center;
repeat: no-repeat;
}
}
@@ -63,8 +63,7 @@ form#new_session {
}
&.step-1 {
span {
- background-image: url(/images/tutorial-bryant.png);
- width: 94px;
+ width: 125px;
height: 94px;
}
b {
View
2  public/stylesheets/scss/users.scss
@@ -22,7 +22,7 @@ ul#setup {
background-image: url(/images/icons/google-calendar.jpg);
}
&.documents {
- background-image: url(/images/icons/oogle-documents.jpg);
+ background-image: url(/images/icons/google-documents.jpg);
}
&.complete {
background-image: url(/images/icons/complete.jpg);
View
6 public/stylesheets/sessions.css
@@ -10,10 +10,10 @@ form#new_session .left a { display: block; width: 631px; height: 155px; backgrou
#tutorial .header h2 { font-size: 40px; }
#tutorial .header h2 a { color: #7a7a7a; }
#tutorial .header h2 a:hover, #tutorial .header h2 a.active { color: #007cca; text-decoration: none; }
-#tutorial .header h2 a:hover span, #tutorial .header h2 a.active span { background-position: bottom center; }
-#tutorial .header h2 a span { display: block; margin: 0 auto; background-position: top center; background-repeat: no-repeat; }
+#tutorial .header h2 a:hover span, #tutorial .header h2 a.active span { background-position: top center; }
+#tutorial .header h2 a span { display: block; margin: 0 auto; background-position: bottom center; background-repeat: no-repeat; }
#tutorial .header h2 a b { display: block; }
-#tutorial .header h2 a.step-1 span { background-image: url(/images/tutorial-bryant.png); width: 94px; height: 94px; }
+#tutorial .header h2 a.step-1 span { width: 125px; height: 94px; }
#tutorial .header h2 a.step-1 b { padding-top: 10px; }
#tutorial .header h2 a.step-2 span { background-image: url(/images/tutorial-allow.png); width: 119px; height: 84px; margin-top: 5px; }
#tutorial .header h2 a.step-2 b { padding-top: 15px; }
View
2  public/stylesheets/users.css
@@ -3,5 +3,5 @@ img#setup-loading { position: absolute; margin: 43px 0 0 110px; }
ul#setup { margin: 50px 0 50px 100px; list-style: none; font-size: 15px; font-style: italic; }
ul#setup li { opacity: 0.5; filter: alpha(opacity=50); margin: 15px 0; padding: 5px 0 5px 40px; background-position: top left; background-repeat: no-repeat; }
ul#setup li.calendar { background-image: url(/images/icons/google-calendar.jpg); }
-ul#setup li.documents { background-image: url(/images/icons/oogle-documents.jpg); }
+ul#setup li.documents { background-image: url(/images/icons/google-documents.jpg); }
ul#setup li.complete { background-image: url(/images/icons/complete.jpg); }
View
BIN  seeds/Bryant University.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 vendor/plugins/uclass/lib/uclass/app/uploads.rb
@@ -16,11 +16,6 @@ def self.included(klass)
klass.class_eval do
scope :images, where("upload_content_type REGEXP '^image\/'")
scope :files, where("upload_content_type NOT REGEXP '^image\/'")
-
- has_attached_file :upload,
- :styles => { :normal => "250x250>", :thumb => "100x100>" },
- :url => "/:class/:id/:folders/:sha1d_basename.:extension",
- :path => ":rails_root/public/:class/:id/:folders/:sha1d_basename.:extension"
validates_attachment_presence :upload,
:message => "can't be blank"
@@ -32,7 +27,6 @@ def self.included(klass)
:message => 'must be less than :max megabytes'
before_create {|upload| upload.name = upload.upload_file_name if upload.name.blank?}
- before_post_process :image?
def url(size=:original)
upload.url(size.to_sym) # just in case we forget, force a to_sym
Please sign in to comment.
Something went wrong with that request. Please try again.