Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

minor tweaks for layout, etc

  • Loading branch information...
commit f05a6cc9753d9c60971902378ddd3ad89c932a2d 1 parent 891107f
@jlapier authored
View
1  .gitignore
@@ -18,6 +18,7 @@ public/wiki_page_assets/
public/user_assets/
public/themes
public/images/favorite.png
+public/images/rrcp_logo.png
coverage/
.rvmrc
public/files
View
2  app/controllers/application_controller.rb
@@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base
private
def broken_link
- if request.url =~ /(content_page_assets|.js)/
+ if request.url =~ /(content_page_assets|wiki_page_assets|user_assets|message_post_assets|.js|.css)/
render :status => 404
else
logger.info "Broken link: #{request.url}"
View
2  app/controllers/content_pages_controller.rb
@@ -48,7 +48,7 @@ def show
# GET /content_pages/new
# GET /content_pages/new.xml
def new
- @content_page = ContentPage.new
+ @content_page = ContentPage.new :page_layout => "default"
respond_to do |format|
format.html # new.html.erb
View
4 app/views/event_calendar/events/_form.html.erb
@@ -28,7 +28,7 @@
</fieldset>
</li>
<%= form.input :start_date, :required => false, :as => :string,
- :input_html => { :value => @event.start_date.to_s(:american) } %>
+ :input_html => { :value => @event.start_date ? @event.start_date.to_s(:american) : '' } %>
<li id="event_end_time_input" class="time optional">
<input id="event_end_time_1i" type="hidden" value="<%= Date.current.year %>" name="event[end_time(1i)]">
<fieldset>
@@ -52,7 +52,7 @@
</fieldset>
</li>
<%= form.input :end_date, :required => false, :as => :string,
- :input_html => { :value => @event.end_date.to_s(:american) } %>
+ :input_html => { :value => @event.end_date ? @event.end_date.to_s(:american) : '' } %>
<%= form.input :timezone, :as => :time_zone, :priority_zones => /^(Eastern|Central|Mountain|Pacific) Time/ %>
<%= form.input :facilitators, :hint => 'eg Sally Resonant, DSM WRRC' %>
<%= form.input :presenters, :hint => 'eg Jane Doe, DSM WRRC' %>
View
2  app/views/layouts/application.html.erb
@@ -13,7 +13,7 @@
<%= stylesheet_link_tag 'screen', :media => 'screen, projection' %>
<% end -%>
<%= stylesheet_link_tag 'fullcalendar_changes', :media => 'screen, projection' %>
- <%= stylesheet_link_tag "file_share/plupload/screen", :media => "screen, projection" %>
+ <%= stylesheet_link_tag "plupload/screen", :media => "screen, projection" %>
<%= stylesheet_link_tag 'print', :media => 'print' %>
View
5 app/views/themes/index.html.erb
@@ -26,8 +26,7 @@
</div>
-<p class="admin_links">
- <%= link_to 'Site Administration', admin_site_settings_path %>
+<% content_for :admin_bar do %>
<!-- |
<%= link_to 'Custom CSS', :controller => :themes, :action => :css_editor %> -->
-</p>
+<% end %>
View
BIN  public/images/rrcp_logo.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/stylesheets/plupload/backgrounds.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/stylesheets/plupload/buttons-disabled.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/stylesheets/plupload/buttons.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/stylesheets/plupload/delete.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/stylesheets/plupload/done.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/stylesheets/plupload/error.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
172 public/stylesheets/plupload/screen.css
@@ -0,0 +1,172 @@
+
+/*
+ Plupload
+------------------------------------------------------------------- */
+
+.plupload_button {
+ display: -moz-inline-box; /* FF < 3*/
+ display: inline-block;
+ font: normal 12px sans-serif;
+ text-decoration: none;
+ color: #42454a;
+ border: 1px solid #bababa;
+ padding: 2px 8px 3px 20px;
+ margin-right: 4px;
+ background: #f3f3f3 url('buttons.png') no-repeat 0 center;
+ outline: 0;
+
+ /* Optional rounded corners for browsers that support it */
+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+}
+
+.plupload_button:hover {
+ color: #000;
+ text-decoration: none;
+}
+
+.plupload_disabled, a.plupload_disabled:hover {
+ color: #737373;
+ border-color: #c5c5c5;
+ background: #ededed url('buttons-disabled.png') no-repeat 0 center;
+ cursor: default;
+}
+
+.plupload_add {
+ background-position: -181px center;
+}
+
+.plupload_wrapper {
+ font: normal 11px Verdana,sans-serif;
+ width: 100%;
+}
+
+.plupload_container {
+ padding: 8px;
+ background: url('transp50.png');
+ /*-moz-border-radius: 5px;*/
+}
+
+.plupload_header {background: #2A2C2E url('backgrounds.gif') repeat-x;}
+.plupload_header_content {
+ background: url('backgrounds.gif') no-repeat 0 -317px;
+ min-height: 56px;
+ padding-left: 60px;
+ color: #FFF;
+}
+.plupload_header_title {
+ font: normal 18px sans-serif;
+ padding: 6px 0 3px;
+}
+.plupload_header_text {
+ font: normal 12px sans-serif;
+}
+
+.plupload_filelist {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.plupload_scroll .plupload_filelist {
+ height: 185px;
+ background: #F5F5F5;
+ overflow-y: scroll;
+}
+
+.plupload_filelist li {
+ padding: 10px 8px;
+ background: #F5F5F5 url('backgrounds.gif') repeat-x 0 -156px;
+ border-bottom: 1px solid #DDD;
+}
+
+.plupload_filelist_header, .plupload_filelist_footer {
+ background: #DFDFDF;
+ padding: 8px 8px;
+ color: #42454A;
+}
+.plupload_filelist_header {
+ border-top: 1px solid #EEE;
+ border-bottom: 1px solid #CDCDCD;
+}
+
+.plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;}
+.plupload_file_name {float: left; overflow: hidden}
+.plupload_file_status {color: #777;}
+.plupload_file_status span {color: #42454A;}
+.plupload_file_size, .plupload_file_status, .plupload_progress {
+ float: right;
+ width: 80px;
+}
+.plupload_file_size, .plupload_file_status, .plupload_file_action {text-align: right;}
+
+.plupload_filelist .plupload_file_name {width: 205px}
+
+.plupload_file_action {
+ float: right;
+ width: 16px;
+ height: 16px;
+ margin-left: 15px;
+}
+
+.plupload_file_action * {
+ display: none;
+ width: 16px;
+ height: 16px;
+}
+
+li.plupload_uploading {background: #ECF3DC url('backgrounds.gif') repeat-x 0 -238px;}
+li.plupload_done {color:#AAA}
+
+li.plupload_delete a {
+ background: url('delete.gif');
+}
+
+li.plupload_failed a {
+ background: url('error.gif');
+ cursor: default;
+}
+
+li.plupload_done a {
+ background: url('done.gif');
+ cursor: default;
+}
+
+.plupload_progress, .plupload_upload_status {
+ display: none;
+}
+
+.plupload_progress_container {
+ margin-top: 3px;
+ border: 1px solid #CCC;
+ background: #FFF;
+ padding: 1px;
+}
+.plupload_progress_bar {
+ width: 0px;
+ height: 7px;
+ background: #CDEB8B;
+}
+
+.plupload_scroll .plupload_filelist_header .plupload_file_action, .plupload_scroll .plupload_filelist_footer .plupload_file_action {
+ margin-right: 17px;
+}
+
+/* Floats */
+
+.plupload_clear,.plupload_clearer {clear: both;}
+.plupload_clearer, .plupload_progress_bar {
+ display: block;
+ font-size: 0;
+ line-height: 0;
+}
+
+li.plupload_droptext {
+ background: transparent;
+ text-align: center;
+ vertical-align: middle;
+ border: 0;
+ line-height: 165px;
+}
View
BIN  public/stylesheets/plupload/transp50.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  themes/page_layouts/no_header.html.erb
@@ -0,0 +1 @@
+<%= page_body %>
Please sign in to comment.
Something went wrong with that request. Please try again.