Entrega 6

.gitignore

@@ -16,3 +16,7 @@
 
 # ignore al .DS_store files of MAC OSX
 .DS_Store
+
+# ignore paperclip installation files
+public/system
+.project

Gemfile

@@ -9,6 +9,8 @@ gem 'sqlite3'
 
 gem 'devise'
 
+gem 'paperclip'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do

Gemfile.lock

@@ -32,6 +32,7 @@ GEM
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
     cleditor_rails (0.0.3)
+    cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -61,6 +62,12 @@ GEM
     mime-types (1.17.2)
     multi_json (1.1.0)
     orm_adapter (0.0.7)
+    paperclip (3.0.2)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (>= 0.0.2)
+      mime-types
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -117,6 +124,7 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   devise
   jquery-rails
+  paperclip
   rails (= 3.2.2)
   sass-rails (~> 3.2.3)
   sqlite3

app/assets/javascripts/comentarios.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/comentarios.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the comentarios controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/planet.css

@@ -97,6 +97,7 @@
   margin-left: 9em;  /* Ajuste de borde izquierdo */
   padding-top: 4ex;
   padding-left: 2em;
+  padding-bottom: 1em;
   background: white;
 }
 
@@ -113,6 +114,16 @@
   color: #bfb;
   font-size: small;
 }
+
+#bottom {
+  padding: 1em;
+  text-align: center;
+}
+
+#bottom a {
+  color: #bfb;
+  font-size: small;
+}
 /* END:mainlayout */
 
 /* An entry in the store catalog (no utilizados de momento) */
@@ -161,3 +172,15 @@
   font-weight: bold;
   margin-right: 2em;
 }
+
+#map_canvas {
+ width: 300px;
+ height: 300px;
+ float: right;
+ margin-right: 100px;
+}
+
+#author-photo {
+ float: right;
+ margin-right: 100px;
+}

app/assets/stylesheets/planet.css~

@@ -0,0 +1,187 @@
+/* Global styles (no utilizados de momento) */
+
+#planet #notice {
+        color: #000;
+        border: 2px solid red;
+        padding: 1em;
+        margin-bottom: 2em;
+        background-color: #f0f0f0;
+        font: bold smaller sans-serif;
+}
+
+
+#planet h1 {
+        font:  150% sans-serif;
+        color: #226;
+        border-bottom: 3px dotted #77d;
+}
+
+/* Styles for products/index */
+
+#site_list table {
+        border-collapse: collapse;
+}
+
+#site_list table tr td {
+        padding: 5px;
+        vertical-align: top;
+}
+
+#site_list .list_image {
+  width:        60px;
+  height:       70px;
+}
+
+#site_list .list_description {
+  width:        60%;
+}
+
+#site_list .list_description dl {
+        margin: 0;
+}
+
+#site_list .list_description dt {
+	color:        #244;
+	font-weight:  bold;
+	font-size:    larger;
+}
+
+#site_list .list_description dd {
+        margin: 0;
+}
+
+#site_list .list_actions {
+  font-size:    x-small;
+  text-align:   right;
+  padding-left: 1em;
+}
+
+#site_list .list_line_even {
+  background:   #a8b8f8;
+}
+
+#site_list .list_line_odd {
+  background:   #88b0f8;
+}
+
+
+/* START:mainlayout */
+/* Styles for main page */
+
+#banner {
+  background: #668;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  border-bottom: 2px solid;  
+  font: small-caps 40px/40px "Times New Roman", serif;
+  color: #bfb;
+  text-align: center;
+}
+
+#banner img {
+  float: left;
+  padding-left: 10px;
+}
+
+#banner .user {
+  float: right;
+  color: #bfb;
+  font-size: small;
+}
+
+#columns {
+  background: #446;
+}
+
+#main {
+  margin-left: 9em;  /* Ajuste de borde izquierdo */
+  padding-top: 4ex;
+  padding-left: 2em;
+  padding-bottom: 1em;
+  background: white;
+}
+
+#side {
+  float: left;
+  padding-top: 1em;
+  padding-left: 1em;
+  padding-bottom: 1em;
+  width: 8em;          /* Ajuste de borde izquierdo */
+  background: #446;
+}
+
+#side a {
+  color: #bfb;
+  font-size: small;
+}
+
+#bottom {
+  padding: 1em;
+  text-align: center;
+}
+
+#bottom a {
+  color: #bfb;
+  font-size: small;
+}
+/* END:mainlayout */
+
+/* An entry in the store catalog (no utilizados de momento) */
+
+#planet  .entry {
+  overflow: auto;
+  margin-top: 1em;
+  border-bottom: 1px dotted #77d;
+}
+
+#planet  .name {
+  font-size: 120%;
+  font-family: sans-serif;
+}
+
+#store .entry img {
+  width: 80px;
+  margin-right: 5px;
+  margin-bottom: 5px;
+  float: left;
+}
+
+
+#store .entry h3 {
+ margin-top: 0;
+ margin-bottom: 2px;
+ color: #227;
+}
+
+#store .entry p {
+ margin-top: 0.5em; 
+ margin-bottom: 0.8em; 
+}
+
+#store .entry .price_line {
+ clear: both;
+ margin-bottom: 0.5em;
+}
+
+#store .entry .add_to_cart {
+  position: relative;
+}
+
+#store .entry  .price {
+  color: #44a;
+  font-weight: bold;
+  margin-right: 2em;
+}
+
+#map_canvas {
+ width: 300px;
+ height: 300px;
+ float: right;
+ margin-right: 100px;
+}
+
+#author-photo {
+ float: left;
+ position: absolute;
+ margin-left: 500px;
+}