summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo k <mo@mokhan.ca>2012-07-28 20:46:04 -0600
committermo k <mo@mokhan.ca>2012-07-28 20:46:04 -0600
commitf2a6f1d9ced9b2176ce150a84ed73466863f8918 (patch)
tree95c6c1a46c7f5ba00dd4fc085fa533e6c9df0c41
parentdc399e66c256ea0d758ccb7208939001be5ecff2 (diff)
add colorbox css and images
-rw-r--r--app/assets/javascripts/creations.js5
-rw-r--r--app/assets/stylesheets/application.css1
-rw-r--r--app/views/creations/show.html.erb11
-rwxr-xr-xvendor/assets/images/border.pngbin0 -> 112 bytes
-rwxr-xr-xvendor/assets/images/controls.pngbin0 -> 2893 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderBottomCenter.pngbin0 -> 111 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderBottomLeft.pngbin0 -> 215 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderBottomRight.pngbin0 -> 217 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderMiddleLeft.pngbin0 -> 108 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderMiddleRight.pngbin0 -> 108 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderTopCenter.pngbin0 -> 111 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderTopLeft.pngbin0 -> 216 bytes
-rwxr-xr-xvendor/assets/images/ie6/borderTopRight.pngbin0 -> 214 bytes
-rwxr-xr-xvendor/assets/images/loading.gifbin0 -> 9427 bytes
-rwxr-xr-xvendor/assets/images/loading_background.pngbin0 -> 157 bytes
-rwxr-xr-xvendor/assets/images/overlay.pngbin0 -> 182 bytes
-rwxr-xr-xvendor/assets/stylesheets/colorbox.css86
17 files changed, 101 insertions, 2 deletions
diff --git a/app/assets/javascripts/creations.js b/app/assets/javascripts/creations.js
index f2e5955b..01ad31aa 100644
--- a/app/assets/javascripts/creations.js
+++ b/app/assets/javascripts/creations.js
@@ -27,3 +27,8 @@ Creations.Crop = {
}
}
};
+Creations.Show = {
+ initialize: function(){
+ $('.thumbnail').colorbox({rel:'thumbnail'});
+ }
+};
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index d4264c90..14478b25 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -3,6 +3,7 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require jquery.Jcrop
+ *= require colorbox
*= require_self
*= require_tree .
*/
diff --git a/app/views/creations/show.html.erb b/app/views/creations/show.html.erb
index 20dd535d..d6400992 100644
--- a/app/views/creations/show.html.erb
+++ b/app/views/creations/show.html.erb
@@ -1,5 +1,12 @@
<% provide(:title, "#{@creation.name} by #{@creation.user.name}") -%>
<% provide(:description, "#{@creation.story}") -%>
+<% content_for :head do %>
+ <script type="text/javascript" charset="utf-8">
+ $(function() {
+ Creations.Show.initialize();
+ });
+ </script>
+<% end -%>
<div class="page-header">
<% if(@creation.is_restricted) -%>
<div style="float:right;">
@@ -22,9 +29,9 @@
<div class="row">
<div class="span12">
<ul class="thumbnails">
- <li class="span6"><a class="thumbnail" href="#"><img src="<%= @creation.image_url(:large).to_s %>" alt="<%= @creation.name %>" /></a></li>
+ <li class="span6"><a class="thumbnail" href="<%= @creation.image_url(:large).to_s %>"><img src="<%= @creation.image_url(:large).to_s %>" alt="<%= @creation.name %>" /></a></li>
<% @creation.photos.each do |photo| %>
- <li class="span3"><a class="thumbnail" href="#"><img src="<%= photo.image.thumb.url.to_s %>" alt="<%= @creation.name %>" /></a></li>
+ <li class="span3"><a class="thumbnail" href="<%= photo.image.url.to_s %>"><img src="<%= photo.image.thumb.url.to_s %>" alt="<%= @creation.name %>" /></a></li>
<% end %>
<% if @creation.user == current_user %>
<% if @creation.photos.length < 4 %>
diff --git a/vendor/assets/images/border.png b/vendor/assets/images/border.png
new file mode 100755
index 00000000..f463a10d
--- /dev/null
+++ b/vendor/assets/images/border.png
Binary files differ
diff --git a/vendor/assets/images/controls.png b/vendor/assets/images/controls.png
new file mode 100755
index 00000000..dcfd6fb9
--- /dev/null
+++ b/vendor/assets/images/controls.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderBottomCenter.png b/vendor/assets/images/ie6/borderBottomCenter.png
new file mode 100755
index 00000000..0d4475ed
--- /dev/null
+++ b/vendor/assets/images/ie6/borderBottomCenter.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderBottomLeft.png b/vendor/assets/images/ie6/borderBottomLeft.png
new file mode 100755
index 00000000..2775eba8
--- /dev/null
+++ b/vendor/assets/images/ie6/borderBottomLeft.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderBottomRight.png b/vendor/assets/images/ie6/borderBottomRight.png
new file mode 100755
index 00000000..f7f51379
--- /dev/null
+++ b/vendor/assets/images/ie6/borderBottomRight.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderMiddleLeft.png b/vendor/assets/images/ie6/borderMiddleLeft.png
new file mode 100755
index 00000000..a2d63d15
--- /dev/null
+++ b/vendor/assets/images/ie6/borderMiddleLeft.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderMiddleRight.png b/vendor/assets/images/ie6/borderMiddleRight.png
new file mode 100755
index 00000000..fd7c3e84
--- /dev/null
+++ b/vendor/assets/images/ie6/borderMiddleRight.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderTopCenter.png b/vendor/assets/images/ie6/borderTopCenter.png
new file mode 100755
index 00000000..2937a9cf
--- /dev/null
+++ b/vendor/assets/images/ie6/borderTopCenter.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderTopLeft.png b/vendor/assets/images/ie6/borderTopLeft.png
new file mode 100755
index 00000000..f9d458b5
--- /dev/null
+++ b/vendor/assets/images/ie6/borderTopLeft.png
Binary files differ
diff --git a/vendor/assets/images/ie6/borderTopRight.png b/vendor/assets/images/ie6/borderTopRight.png
new file mode 100755
index 00000000..74b8583c
--- /dev/null
+++ b/vendor/assets/images/ie6/borderTopRight.png
Binary files differ
diff --git a/vendor/assets/images/loading.gif b/vendor/assets/images/loading.gif
new file mode 100755
index 00000000..b4695d81
--- /dev/null
+++ b/vendor/assets/images/loading.gif
Binary files differ
diff --git a/vendor/assets/images/loading_background.png b/vendor/assets/images/loading_background.png
new file mode 100755
index 00000000..6ae83e69
--- /dev/null
+++ b/vendor/assets/images/loading_background.png
Binary files differ
diff --git a/vendor/assets/images/overlay.png b/vendor/assets/images/overlay.png
new file mode 100755
index 00000000..53ea98f7
--- /dev/null
+++ b/vendor/assets/images/overlay.png
Binary files differ
diff --git a/vendor/assets/stylesheets/colorbox.css b/vendor/assets/stylesheets/colorbox.css
new file mode 100755
index 00000000..397fe3dc
--- /dev/null
+++ b/vendor/assets/stylesheets/colorbox.css
@@ -0,0 +1,86 @@
+/*
+ ColorBox Core Style:
+ The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/*
+ User Style:
+ Change the following styles to modify the appearance of ColorBox. They are
+ ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
+#colorbox{}
+ #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;}
+ #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;}
+ #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;}
+ #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;}
+ #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;}
+ #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;}
+ #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;}
+ #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;}
+ #cboxContent{background:#fff; overflow:hidden;}
+ .cboxIframe{background:#fff;}
+ #cboxError{padding:50px; border:1px solid #ccc;}
+ #cboxLoadedContent{margin-bottom:28px;}
+ #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
+ #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
+ #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
+ #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
+ #cboxPrevious:hover{background-position:-75px -25px;}
+ #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
+ #cboxNext:hover{background-position:-50px -25px;}
+ #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
+ #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+ #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
+ #cboxClose:hover{background-position:-25px -25px;}
+
+/*
+ The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+ when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9.
+ See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,
+.cboxIE #cboxTopCenter,
+.cboxIE #cboxTopRight,
+.cboxIE #cboxBottomLeft,
+.cboxIE #cboxBottomCenter,
+.cboxIE #cboxBottomRight,
+.cboxIE #cboxMiddleLeft,
+.cboxIE #cboxMiddleRight {
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
+}
+
+/*
+ The following provides PNG transparency support for IE6
+ Feel free to remove this and the /ie6/ directory if you have dropped IE6 support.
+*/
+.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);}
+.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);}
+.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);}
+.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);}
+.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);}
+.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);}
+.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);}
+.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);}
+
+.cboxIE6 #cboxTopLeft,
+.cboxIE6 #cboxTopCenter,
+.cboxIE6 #cboxTopRight,
+.cboxIE6 #cboxBottomLeft,
+.cboxIE6 #cboxBottomCenter,
+.cboxIE6 #cboxBottomRight,
+.cboxIE6 #cboxMiddleLeft,
+.cboxIE6 #cboxMiddleRight {
+ _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");
+}