Entrega 2 de Pedro Miguel García de Frutos y Miguel González López

Gemfile.lock

@@ -94,6 +94,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
+    sqlite3 (1.3.4-x86-mingw32)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -108,6 +109,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   cleditor_rails

app/assets/stylesheets/planet.css

@@ -17,6 +17,11 @@
 }
 
 /* Styles for products/index */
+#site df {
+	color:        #244;
+	font-style:  italic;
+	font-size:    x-small;
+}
 
 #site_list table {
         border-collapse: collapse;
@@ -46,15 +51,27 @@
 	font-size:    larger;
 }
 
+#site_list .list_description df {
+	color:        #244;
+	font-style:  italic;
+	font-size:    x-small;
+}
 #site_list .list_description dd {
         margin: 0;
+
 }
 
+
 #site_list .list_actions {
   font-size:    x-small;
   text-align:   right;
   padding-left: 1em;
 }
+#site_list .list_actions df {
+	color:        #244;
+	font-style:  italic;
+	font-size:    x-small;
+}
 
 #site_list .list_line_even {
   background:   #a8b8f8;
@@ -155,3 +172,15 @@
   font-weight: bold;
   margin-right: 2em;
 }
+#mapa{ 
+	width: 50%; 
+	height: 35%;
+	position: absolute; 
+	top: 275px;
+	right: 20px;
+}
+#locationinfo{
+	position: absolute; 
+	top: 500px;
+	right: 20px;
+}

app/assets/stylesheets/planet.css~

@@ -0,0 +1,176 @@
+/* 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 df {
+	color:        #244;
+	font-style:  italic;
+	font-size:    x-small;
+}
+#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;
+}
+
+#columns {
+  background: #446;
+}
+
+#main {
+  margin-left: 9em;  /* Ajuste de borde izquierdo */
+  padding-top: 4ex;
+  padding-left: 2em;
+  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;
+}
+/* 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;
+}
+#mapa{ 
+	width: 50%; 
+	height: 35%;
+	position: absolute; 
+	top: 275px;
+	right: 20px;
+}
+#locationinfo{
+	position: absolute; 
+	top: 500px;
+	right: 20px;
+}

app/assets/stylesheets/trips.css.scss

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

app/controllers/planet_controller.rb

@@ -5,8 +5,12 @@ def index
   def contact
   end
 
-# GET /planet/ejemplo
+  # GET /planet/ejemplo
   def ejemplo
   end
 
+  # GET /planet/author
+  def author  
+  end
+
 end

app/controllers/sites_controller.rb

@@ -9,6 +9,8 @@ def index
       @sites = Type.find(params[:type_id]).sites
     end
 
+    @trip = Trip.new
+
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sites }
@@ -20,6 +22,8 @@ def index
   def show
     @site = Site.find(params[:id])
 
+    @trip = Trip.new
+
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @site }
@@ -78,11 +82,18 @@ def update
   # DELETE /sites/1.json
   def destroy
     @site = Site.find(params[:id])
+    @trips= Trip.where("site_id like ?", @site.id)
+    @trips.each do |trip|
+    	    trip.destroy
+    end
+
     @site.destroy
 
     respond_to do |format|
-      format.html { redirect_to sites_url }
+      format.html { redirect_to sites_url , notice: 'Site was successfully updated.'}
       format.json { head :ok }
     end
   end
+
+
 end