fixing asset handling, using sprockets

bborn · May 6, 2011 · 8de8018 · 8de8018
1 parent 1e752aa
commit 8de8018
Show file tree

Hide file tree

Showing 24 changed files with 471 additions and 492 deletions.
diff --git a/app/assets/javascripts/community_engine.js b/app/assets/javascripts/community_engine.js
@@ -0,0 +1,6 @@
+//= require prototype
+//= require effects
+//= require rails
+//= require application
+//= require controls
+//= require lightbox
diff --git a/app/assets/javascripts/cropper.css b/app/assets/javascripts/cropper.css
@@ -52,15 +52,15 @@
 	position: absolute;
 	width: 100%;
 	height: 1px;
-	background: transparent url(/community_engine/images/cropper/marqueeHoriz.gif) repeat-x 0 0;
+	background: transparent url(/assets/cropper/marqueeHoriz.gif) repeat-x 0 0;
 	z-index: 3;
 }
 
 .imgCrop_marqueeVert {
 	position: absolute;
 	height: 100%;
 	width: 1px;
-	background: transparent url(/community_engine/images/cropper/marqueeVert.gif) repeat-y 0 0;
+	background: transparent url(/assets/cropper/marqueeVert.gif) repeat-y 0 0;
 	z-index: 3;
 }
 

diff --git a/app/assets/javascripts/lightbox.js b/app/assets/javascripts/lightbox.js
@@ -51,7 +51,7 @@ Lightbox.base.prototype = {
 		Element.addClassName(this.element, 'lbox')
 
 		//Tip: make sure the path to the close.gif image below is correct for your setup
-		closer = '<img id="close" src="/community_engine/images/close.gif" alt="Close" title="Close this window" />'
+		closer = '<img id="close" src="/assets/close.gif" alt="Close" title="Close this window" />'
 
 		//insert the closer image into the div
 		new Insertion.Top(this.element, closer);

diff --git a/app/assets/javascripts/tiny_mce/plugins/curblyadvimage/image.htm b/app/assets/javascripts/tiny_mce/plugins/curblyadvimage/image.htm
@@ -48,7 +48,7 @@
 
           <div id='dynamic_images_list'>
             Loading Images...<br />
-            <img src='/community_engine/images/spinner.gif'>
+            <img src='/assets/spinner.gif'>
           </div>
 		      </fieldset>
 		  </div>		  

diff --git a/app/assets/javascripts/tiny_mce/plugins/curblyadvimage/js/functions.js b/app/assets/javascripts/tiny_mce/plugins/curblyadvimage/js/functions.js
@@ -27,7 +27,7 @@ function formElement() {
         return document.forms[1];
         }
 function ts_onload(){
-        $('dynamic_images_list').update("Uploading...<br /><img src='/community_engine/images/spinner.gif'>");
+        $('dynamic_images_list').update("Uploading...<br /><img src='/assets/spinner.gif'>");
         mcTabs.displayTab('dynamic_select_tab','dynamic_select_panel');
 
         var iframe1=ts_ce('iframe','html_editor_image_upload_frame');

diff --git a/app/assets/stylesheets/community_engine.css b/app/assets/stylesheets/community_engine.css
@@ -0,0 +1,10 @@
+/*
+ *= require_tree . 
+*/
+
+/*
+ *= reset-fonts-grids
+ *= screen
+ *= print
+ *= lightbox
+*/
diff --git a/app/assets/stylesheets/forum.css b/app/assets/stylesheets/forum.css
@@ -272,7 +272,7 @@ label {
 /* random */
 
 .photo {
-	background:#aaa url(/community_engine/images/clearbits/smile.gif) no-repeat 8px 8px;
+	background:#aaa url(/assets/clearbits/smile.gif) no-repeat 8px 8px;
 }
 #footer_content .photo {
 	/* Prevents conflict with footer class*/
@@ -525,7 +525,7 @@ p.online {margin-bottom:0;}
 
 img.icon {
 	background:#696;
-	background-image: url(/community_engine/images/clearbits/bg_rounded.gif);
+	background-image: url(/assets/clearbits/bg_rounded.gif);
 	background-repeat: no-repeat;
 	vertical-align: bottom;
 	}
@@ -542,7 +542,7 @@ img.green { background-color:#0c0;}
 /* reply */
 
 div.editbox {
-	background:url(/community_engine/images/reply_background.png);
+	background:url(/assets/reply_background.png);
 	border:2px solid #333;
 	border-width:2px 0;
 	position:fixed;

diff --git a/app/assets/stylesheets/screen.css b/app/assets/stylesheets/screen.css
@@ -117,15 +117,15 @@ float: right;
 padding-left: 20px;
 margin-right: 20px;
 background-color: transparent;
-background-image: url(/community_engine/images/icons/email_open.png);
+background-image: url(/assets/icons/email_open.png);
 background-repeat: no-repeat;
 background-position: left center;
 }
 
 /* Navbar */
 
 #NavBar{
-background: #aba8a3 url(/community_engine/images/bg_navbar.gif) repeat-x 0 0;
+background: #aba8a3 url(/assets/bg_navbar.gif) repeat-x 0 0;
 border-top: 1px solid #d9d6d3;
 clear: both;
 }
@@ -158,7 +158,7 @@ text-decoration: none !important;
 font-size: 108%;
 padding: 4px 15px 4px 5px;
 margin: 11px 10px 0 0;
-background: #fff url(/community_engine/images/search.gif) no-repeat right center;
+background: #fff url(/assets/search.gif) no-repeat right center;
 border: none;
 }
 
@@ -186,12 +186,12 @@ margin-bottom:.5em;
 font-size: 108%;}
 
 #welcome .box h4{
-background:url(/community_engine/images/bg_h6btn.gif) repeat-x left center;
+background:url(/assets/bg_h6btn.gif) repeat-x left center;
 }
 
 #welcome .box h4 a{
 background-color: transparent;
-background-image: url(/community_engine/images/icons/52.png);
+background-image: url(/assets/icons/52.png);
 background-repeat: no-repeat;
 background-position: .5em center;
 display: block;
@@ -205,7 +205,7 @@ border: 1px solid #9ec500;
 }
 
 #welcome .first .box h4 a{
-background-image: url(/community_engine/images/icons/31.png);
+background-image: url(/assets/icons/31.png);
 }
 
 #welcome .box h4 a:hover{
@@ -348,21 +348,21 @@ font-weight: bold;
 padding:0 0 3px 0;
 }
 
-.hentry .vcard ul li.update{background-image: url(/community_engine/images/icons/date.png) }
-.hentry .vcard ul li.view{background-image: url(/community_engine/images/icons/page_white_magnify.png) }
-.hentry .vcard ul li.comments{background-image: url(/community_engine/images/icons/comments.png) }
-.hentry .vcard ul li.msg{background-image: url(/community_engine/images/icons/email_go.png) }
-.hentry .vcard ul li.addfriend{background-image: url(/community_engine/images/icons/user_add.png) }
-.hentry .vcard ul li.print{background-image: url(/community_engine/images/icons/printer.png) }
-.hentry .vcard ul li.email{background-image: url(/community_engine/images/icons/user_go.png) }
+.hentry .vcard ul li.update{background-image: url(/assets/icons/date.png) }
+.hentry .vcard ul li.view{background-image: url(/assets/icons/page_white_magnify.png) }
+.hentry .vcard ul li.comments{background-image: url(/assets/icons/comments.png) }
+.hentry .vcard ul li.msg{background-image: url(/assets/icons/email_go.png) }
+.hentry .vcard ul li.addfriend{background-image: url(/assets/icons/user_add.png) }
+.hentry .vcard ul li.print{background-image: url(/assets/icons/printer.png) }
+.hentry .vcard ul li.email{background-image: url(/assets/icons/user_go.png) }
 .hentry .vcard ul li.share{
-/*	background-image: url(/community_engine/images/icons/group_go.png) */
+/*	background-image: url(/assets/icons/group_go.png) */
 	padding-left:0;
 	}
-.hentry .vcard ul li.tags{background-image: url(/community_engine/images/icons/tag_blue.png) }
-.hentry .vcard ul li.geo{background-image: url(/community_engine/images/icons/world.png) }
-.hentry .vcard ul li.edit{background-image: url(/community_engine/images/icons/post.png) }
-.hentry .vcard ul li.delete{background-image: url(/community_engine/images/icons/delete.png) }
+.hentry .vcard ul li.tags{background-image: url(/assets/icons/tag_blue.png) }
+.hentry .vcard ul li.geo{background-image: url(/assets/icons/world.png) }
+.hentry .vcard ul li.edit{background-image: url(/assets/icons/post.png) }
+.hentry .vcard ul li.delete{background-image: url(/assets/icons/delete.png) }
 
 .entry-content h6{
 border-bottom: 1px dotted #a2a19b;
@@ -376,7 +376,7 @@ font-size: 85%;
 font-weight: bold;
 text-transform: uppercase;
 text-decoration: none;
-background: transparent url(/community_engine/images/icons/add.png) no-repeat left center;
+background: transparent url(/assets/icons/add.png) no-repeat left center;
 padding-left: 20px;
 padding: 2px 2px 2px 20px;
 }
@@ -404,7 +404,7 @@ background: red;
 display: block;
 margin: 0 10px 5px 0;
 padding: 2px 0 2px 15px;
-background: url(/community_engine/images/icons/tag_blue.png) no-repeat left center;
+background: url(/assets/icons/tag_blue.png) no-repeat left center;
 }
 
 
@@ -425,13 +425,13 @@ border-bottom: 1px dotted #a2a19b;
 .checks li, .page li{
 padding-left: 20px;
 background-color: transparent;
-background-image: url(/community_engine/images/icons/accept.png);
+background-image: url(/assets/icons/accept.png);
 background-repeat: no-repeat;
 background-position: left center;
 }
 
-.checks li{background-image: url(/community_engine/images/icons/accept.png)}
-.page li{background-image:url(/community_engine/images/icons/page_white.png)}
+.checks li{background-image: url(/assets/icons/accept.png)}
+.page li{background-image:url(/assets/icons/page_white.png)}
 
 /* user list */
 dl.vcard{
@@ -470,17 +470,17 @@ background-repeat: no-repeat;
 background-color: transparent;
 }
 
-dl.vcard dd.member{background-image: url(/community_engine/images/icons/user.png);}
-dl.vcard dd.post{background-image: url(/community_engine/images/icons/page_white.png);}
-dl.vcard dd.rss{background-image: url(/community_engine/images/icons/rss.png);}
+dl.vcard dd.member{background-image: url(/assets/icons/user.png);}
+dl.vcard dd.post{background-image: url(/assets/icons/page_white.png);}
+dl.vcard dd.rss{background-image: url(/assets/icons/rss.png);}
 
 h6.all{margin:.5em 0;}
 
 h6.all a{
 font-size: 85%;
 font-weight: bold;
 text-transform: uppercase;
-background: transparent url(/community_engine/images/icons/add.png) no-repeat left center;
+background: transparent url(/assets/icons/add.png) no-repeat left center;
 padding:3px 0 3px 20px;
 color: #379d00;
 }
@@ -631,19 +631,19 @@ margin-left:  12.3846em; /* about 200px - 3em*/
 
 .fresh dt {
 	padding-left: 20px;
-	background-image: url(/community_engine/images/icons/activity_default.png);
+	background-image: url(/assets/icons/activity_default.png);
 	background-repeat: no-repeat;
 	background-position: left center;
 	background-color: transparent;	
 }
 
-.fresh .comment dt {background-image: url(/community_engine/images/icons/comment.png);}
-.fresh .photo dt {background-image: url(/community_engine/images/icons/picture.png);}
-.fresh .clipping dt {background-image: url(/community_engine/images/icons/book.png);}
-.fresh .updated_profile dt {background-image: url(/community_engine/images/icons/user_edit.png);}
-.fresh .favorite dt {background-image: url(/community_engine/images/icons/heart_add.png);}
-.fresh .post dt, .fresh .sb_post dt, .fresh .topic dt{background-image: url(/community_engine/images/icons/post.png);}
-.fresh .rsvp dt, .fresh .event dt {background-image: url(/community_engine/images/icons/date.png);}
+.fresh .comment dt {background-image: url(/assets/icons/comment.png);}
+.fresh .photo dt {background-image: url(/assets/icons/picture.png);}
+.fresh .clipping dt {background-image: url(/assets/icons/book.png);}
+.fresh .updated_profile dt {background-image: url(/assets/icons/user_edit.png);}
+.fresh .favorite dt {background-image: url(/assets/icons/heart_add.png);}
+.fresh .post dt, .fresh .sb_post dt, .fresh .topic dt{background-image: url(/assets/icons/post.png);}
+.fresh .rsvp dt, .fresh .event dt {background-image: url(/assets/icons/date.png);}
 
 /* =============================================== */
 /* 8. COMMUNITY FOOTER                             */
@@ -677,7 +677,7 @@ padding-left: 0;
 #CommunityFooter p{
 float: right;
 padding: 2px 0 2px 120px;
-background: url(/community_engine/images/logo.gif) no-repeat left center;
+background: url(/assets/logo.gif) no-repeat left center;
 }
 
 /* =============================================== */
@@ -864,10 +864,10 @@ ul.message_nav li {
 	background-repeat: no-repeat;
 	padding-left:20px;
 }
-ul.message_nav li.inbox_new {background-image: url(/community_engine/images/icons/email_open.png);}
-ul.message_nav li.inbox {background-image: url(/community_engine/images/icons/email.png);}
-ul.message_nav li.sent {background-image: url(/community_engine/images/icons/email_go.png);}
-li.compose {background-image: url(/community_engine/images/icons/email_edit.png);}
+ul.message_nav li.inbox_new {background-image: url(/assets/icons/email_open.png);}
+ul.message_nav li.inbox {background-image: url(/assets/icons/email.png);}
+ul.message_nav li.sent {background-image: url(/assets/icons/email_go.png);}
+li.compose {background-image: url(/assets/icons/email_edit.png);}
 .messages .photo a img{
 	float: left;
 	display: block;
@@ -913,7 +913,7 @@ table.poll {
     table.poll td .vote {
       display: block;
       float: left;
-      background: url(/community_engine/images/icons/vote.png) no-repeat left;
+      background: url(/assets/icons/vote.png) no-repeat left;
       padding: 0 10px 0 20px;
       height: 20px;
       margin-right: 10px;
@@ -951,10 +951,10 @@ table.poll {
 #user-menu {
 	padding-right: 15px;
 	position: relative;
-	background: url(/community_engine/images/icons/bullet_arrow_down_50.png) no-repeat right;
+	background: url(/assets/icons/bullet_arrow_down_50.png) no-repeat right;
 	}
 #user-menu:hover {
-	background: url(/community_engine/images/icons/bullet_arrow_down.png) no-repeat right;	
+	background: url(/assets/icons/bullet_arrow_down.png) no-repeat right;	
 } 
 #user-menu:hover #user-menu-tip {
   top: 22px;

diff --git a/app/helpers/base_helper.rb b/app/helpers/base_helper.rb
@@ -235,7 +235,7 @@ def last_active
   end
 
   def ajax_spinner_for(id, spinner="spinner.gif")
-    "<img src='/community_engine/images/#{spinner}' style='display:none; vertical-align:middle;' id='#{id.to_s}_spinner'> ".html_safe
+    "<img src='/assets/#{spinner}' style='display:none; vertical-align:middle;' id='#{id.to_s}_spinner'> ".html_safe
   end
 
   def avatar_for(user, size=32)

diff --git a/app/views/events/_subscribe.html.haml b/app/views/events/_subscribe.html.haml
@@ -2,6 +2,6 @@
   %h3= :subscribe_to.l + ' ' + :events.l
   %p= :subscribe_events_instructions.l
   .icon_row
-    = link_to image_tag('/community_engine/images/icons/ical.gif'), ical_events_url(:protocol => 'webcal://', :format=>'ics')
+    = link_to image_tag('/assets/icons/ical.gif'), ical_events_url(:protocol => 'webcal://', :format=>'ics')
     = link_to image_tag("http://www.google.com/calendar/images/ext/gc_button1.gif"), "http://www.google.com/calendar/render?cid=#{ical_events_url(:format=>'ics')}", :target=>'_blank'
 
diff --git a/app/views/photos/_manage_photos.html.haml b/app/views/photos/_manage_photos.html.haml
@@ -7,7 +7,7 @@
   :plain
     $('image_list_pages').select('a').invoke('observe', 'click', remote_paginate )
     function remote_paginate(event){
-      $('dynamic_images_list').update("Loading images...<br /><img src='/community_engine/images/spinner.gif'>");
+      $('dynamic_images_list').update("Loading images...<br /><img src='/assets/spinner.gif'>");
       element = Event.element(event);
       new Ajax.Request(element.href, {asynchronous:true, evalScripts:true, method:'get'});
       Event.stop(event);

diff --git a/app/views/shared/_scripts_and_styles.html.haml b/app/views/shared/_scripts_and_styles.html.haml
@@ -1,15 +1,6 @@
-= javascript_include_tag "prototype"
-= javascript_include_tag "effects"	
-= javascript_include_tag "rails"
-= javascript_include_tag "application"
-= javascript_include_tag "controls" unless current_page?({:controller => 'base', :action => 'site_index'})
+=javascript_include_tag 'community_engine'
+=stylesheet_link_tag 'community_engine'
 
-= stylesheet_link_tag 'reset-fonts-grids.css', :plugin => :community_engine
-= stylesheet_link_tag 'screen', :plugin => :community_engine
-= stylesheet_link_tag 'print', :plugin => :community_engine, :media => 'print'
-
-= javascript_include_tag 'lightbox'
-= stylesheet_link_tag 'lightbox'		
 
 = javascript_include_tiny_mce_if_used
 = tiny_mce if using_tiny_mce?