From 087efc3679d46d2d04117c5bb7327c0e4cda541d Mon Sep 17 00:00:00 2001 From: Mattia Peirano Date: Thu, 15 Dec 2011 13:09:19 +0100 Subject: [PATCH 1/2] Hemos subido la practica a tiempo al moodle - Creacion pagina authors --- README | 7 + app/assets/javascripts/application.js | 1 - app/assets/javascripts/images/buttons.gif | Bin 3064 -> 0 bytes app/assets/javascripts/images/toolbar.gif | Bin 68 -> 0 bytes app/assets/javascripts/jquery.cleditor.min.js | 31 - app/assets/javascripts/trips.js.coffee | 3 - app/assets/stylesheets/application.css | 1 - app/assets/stylesheets/jquery.cleditor.css | 24 - app/assets/stylesheets/trips.css.scss | 3 - app/controllers/planet_controller.rb | 3 + app/controllers/trips_controller.rb | 83 --- app/helpers/trips_helper.rb | 2 - app/models/trip.rb | 2 - app/views/layouts/application.html.erb | 18 +- app/views/trips/_form.html.erb | 29 - app/views/trips/edit.html.erb | 6 - app/views/trips/index.html.erb | 30 - app/views/trips/new.html.erb | 5 - app/views/trips/show.html.erb | 20 - config/routes.rb | 4 +- db/migrate/20111208154738_create_trips.rb | 11 - db/schema.rb | 10 +- public/index.html | 241 -------- test/fixtures/trips.yml | 11 - test/functional/trips_controller_test.rb | 49 -- test/unit/helpers/trips_helper_test.rb | 4 - test/unit/trip_test.rb | 7 - .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 260 -> 0 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 251 -> 0 bytes .../images/ui-bg_flat_10_000000_40x100.png | Bin 178 -> 0 bytes .../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 104 -> 0 bytes .../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 125 -> 0 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes .../ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 3762 -> 0 bytes .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 90 -> 0 bytes .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 129 -> 0 bytes .../images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_228ef1_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_ef8c08_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_ffd27a_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes .../ui-lightness/jquery-ui-1.8.16.custom.css | 568 ------------------ vendor/assets/stylesheets/vendor.css | 4 - 43 files changed, 16 insertions(+), 1161 deletions(-) delete mode 100755 app/assets/javascripts/images/buttons.gif delete mode 100755 app/assets/javascripts/images/toolbar.gif delete mode 100755 app/assets/javascripts/jquery.cleditor.min.js delete mode 100644 app/assets/javascripts/trips.js.coffee delete mode 100755 app/assets/stylesheets/jquery.cleditor.css delete mode 100644 app/assets/stylesheets/trips.css.scss delete mode 100644 app/controllers/trips_controller.rb delete mode 100644 app/helpers/trips_helper.rb delete mode 100644 app/models/trip.rb delete mode 100644 app/views/trips/_form.html.erb delete mode 100644 app/views/trips/edit.html.erb delete mode 100644 app/views/trips/index.html.erb delete mode 100644 app/views/trips/new.html.erb delete mode 100644 app/views/trips/show.html.erb delete mode 100644 db/migrate/20111208154738_create_trips.rb delete mode 100644 public/index.html delete mode 100644 test/fixtures/trips.yml delete mode 100644 test/functional/trips_controller_test.rb delete mode 100644 test/unit/helpers/trips_helper_test.rb delete mode 100644 test/unit/trip_test.rb delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png delete mode 100755 vendor/assets/stylesheets/ui-lightness/jquery-ui-1.8.16.custom.css delete mode 100644 vendor/assets/stylesheets/vendor.css diff --git a/README b/README index 7c36f23..34e16f1 100644 --- a/README +++ b/README @@ -1,3 +1,10 @@ +Reminder: Hemos subido esta practica al tiempo al moodle. + +Saludos + +Robert Fabian +Mattia Peirano + == Welcome to Rails Rails is a web-application framework that includes everything needed to create diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1feebea..37c7bfc 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -5,6 +5,5 @@ // the compiled file. // //= require jquery -//= require jquery-ui //= require jquery_ujs //= require_tree . diff --git a/app/assets/javascripts/images/buttons.gif b/app/assets/javascripts/images/buttons.gif deleted file mode 100755 index 2e464d0c8c7ac7c8dd29d165e4eff36ea27fdd2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3064 zcmYL^X;@PE0*C*H{UG3B(HPVT+}lJQEmA8`RNN9x)5$WdG0n7Wa%(>*87>*-l9eUy zlvYe>Svk|eG;PNw8*8eIOVd7?b<1ugclmOE&-1LbAay@qWr9 zI4L?>-k~dL`1PeAms!%W?{3qox}CG<`vv9IjmlSN9jd9Gxp?oIq&3-VL&S^yGB$0w z{2Ru%bLJE#0TisLKjH zx#IM2d(MqF+b)~*dEstH?mX|#Seb;9P7Rn%MLvIYbHIKL~5}J^{r!kBuxFbAB4hb9n7wV?zhHa3b#G zr%x=$TNMu8-z?q+eg^z*nBe`J9Ll5j>4-)T%1`wyyJwD<|#Izv@n9sT1m3k z@e9IV55;+Px-$)msZ6oCXKw^S5dc>WDFVokq)-p-2Q)JRc2coH>1QVoe_GYx;CGq2 zjF^W3tr;pQ%_>HNG2oj<2`szqzCz1o=ekc#j?! zOi{`cdEwyU;dz@s^oCmgm@5tUoHd9>0^5U1lBHumVT<+Gt+rVPIhmA0mtm_YnnIJr zV#Fyb0LQnL`_qJuNB~UcYe0PHx8LuT%e}p=ILvND47q7e^cF${cZl3-`cTKB=sGd- z28q@mo-?;gdK&+g_gdcpDMEJb`PW_gh69SiO|DA=U`L> z(3ZkXQ0~oAVl?R=?s#J1l3%tytJ|BHa+I;KR%#%xj>cUH(@ppG#-1aY`(Vza1S;^G zFZjgS{N;;~W2jh2Jf?4Zap0CcTltmMAU{Riol^=LNwvD`6Ib&ZyMl{G_T{ShK@ zhAEBQJ{{p<2yIQECztIhR^AdzI6MhlTWS36=`ZG9%J}<(CF5MCQ#iKTvL-MfD9DeQ zzCSm>eH>Sg)xI|Lv)2|szEzDLWv8a32nN8w^;SAhL5GA|3GVt8G`d9$OBxM}auk*b zQocUYRA+Hu^73V+5gn=lV6I6R<0F?SCdH(W&zc>*5FGWy5df}WAYD;v497^a)E;n3 zvuTbkM8Wl|xYe#6QCa!)bca2?G()Z51>1|M@>3wjMD$SHWPFrKRG%ZMLcNQXZBD;^ z%rBI!FI$t5ZKF@gKd+e%LDyi234~e^eqc6`=Mp`EOB|kwnIp2Xp6}0W%$9;7?MbT&5;5K9$IB| zNl*c@gAW7>Y*v-Jj?lE}SfG8wmnUOzWcsG^AQK8GGHhx%8uEDWD&pK?y7z2@ z)`gEDD&N9gTlZ^9)xfouPknjeIDAokDr>Xn%-R?JI5-~Qt&RC<8X=WtDg*pI`Hm=7 zK>_CEjX{T=$nRE^HRPdN{8-LTnI<701X+x;izB6`E^)#f!XiG1$eXUP^q^=!U5xl}%+B#p2ayWw6C9 zyd!pFO9SxDxdf%hXT!1GP)4r)uSFU{OKVk8SXgN5LAN`%v&()z+BgC0Jtx`GB0~o$ zqxi)+F+7|kj)~LatlG7ev?(`E&-VS6l{4Vrh?mjjP4~7cu{6i`vU;E!6$pD$cf7=^1)^ay0y6R#Gan6!SOH-e|uXaxRku$p=*tG z=;dE08E3i+sM13n#D(Gw3^YGKEUTF)ID2U4mp28*bM+nJ`O`U0dm=HL3q^9UMYXDa z{KMar!EYhnp+S=YW9?URAd*Px5(PMN&^C7t>G|(`L=~0}Q9PE@zzHdwsfvI&qQs6k|N-=M(!{tBz~X`;Jw}cOcPpc` z7O4odE14q`5NClrXCvX!m@|^I-K-@onjW3UoDfWZB3vC>=02g^au#^Xq3ox)^OISw z+?~M)u$SeF^fPkyWZSwB{w@IZquKq1z;zNg&RIU166LyXmxVPd9VWtBysQRr^{V{y zgb%IOA9M2}w0Q(<_Zp*cW-weWS5=tOZfI$3MluuZuo)n^DdJM&<8H=s-Xiq%JqlQk zL+&#&L^xoC-g0(9*t{KGdv}RcE4k|BnLwt)ll3aDQ57%{YKEJq8UDU!QCJ}b8K381Ozwp9e>ZKa{lHB5s_>yyZC0#Wo i7rRQjhfAz}n<~M$r9Gn3-uTk1d8Gq2r9UDB;QMa~Mf*?y diff --git a/app/assets/javascripts/images/toolbar.gif b/app/assets/javascripts/images/toolbar.gif deleted file mode 100755 index e6eb2da554925c9587169b7fc1dade3d37da9c46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmZ?wbhEHbWMq(HSj52a`t|EipFaKn|9|GpnQz~|Wq<+2pDbXe4u}M)Wnkvi*m%cL L;S}c)4+d)hRvr~C diff --git a/app/assets/javascripts/jquery.cleditor.min.js b/app/assets/javascripts/jquery.cleditor.min.js deleted file mode 100755 index 5afec04..0000000 --- a/app/assets/javascripts/jquery.cleditor.min.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - CLEditor WYSIWYG HTML Editor v1.3.0 - http://premiumsoftware.net/cleditor - requires jQuery v1.4.2 or later - - Copyright 2010, Chris Landowski, Premium Software, LLC - Dual licensed under the MIT or GPL Version 2 licenses. -*/ -(function(e){function aa(a){var b=this,c=a.target,d=e.data(c,x),h=s[d],f=h.popupName,i=p[f];if(!(b.disabled||e(c).attr(n)==n)){var g={editor:b,button:c,buttonName:d,popup:i,popupName:f,command:h.command,useCSS:b.options.useCSS};if(h.buttonClick&&h.buttonClick(a,g)===false)return false;if(d=="source"){if(t(b)){delete b.range;b.$area.hide();b.$frame.show();c.title=h.title}else{b.$frame.hide();b.$area.show();c.title="Show Rich Text"}setTimeout(function(){u(b)},100)}else if(!t(b))if(f){var j=e(i);if(f== -"url"){if(d=="link"&&M(b)===""){z(b,"A selection is required when inserting a link.",c);return false}j.children(":button").unbind(q).bind(q,function(){var k=j.find(":text"),o=e.trim(k.val());o!==""&&v(b,g.command,o,null,g.button);k.val("http://");r();w(b)})}else f=="pastetext"&&j.children(":button").unbind(q).bind(q,function(){var k=j.find("textarea"),o=k.val().replace(/\n/g,"
");o!==""&&v(b,g.command,o,null,g.button);k.val("");r();w(b)});if(c!==e.data(i,A)){N(b,i,c);return false}return}else if(d== -"print")b.$frame[0].contentWindow.print();else if(!v(b,g.command,g.value,g.useCSS,c))return false;w(b)}}function O(a){a=e(a.target).closest("div");a.css(H,a.data(x)?"#FFF":"#FFC")}function P(a){e(a.target).closest("div").css(H,"transparent")}function ba(a){var b=a.data.popup,c=a.target;if(!(b===p.msg||e(b).hasClass(B))){var d=e.data(b,A),h=e.data(d,x),f=s[h],i=f.command,g,j=this.options.useCSS;if(h=="font")g=c.style.fontFamily.replace(/"/g,"");else if(h=="size"){if(c.tagName=="DIV")c=c.children[0]; -g=c.innerHTML}else if(h=="style")g="<"+c.tagName+">";else if(h=="color")g=Q(c.style.backgroundColor);else if(h=="highlight"){g=Q(c.style.backgroundColor);if(l)i="backcolor";else j=true}b={editor:this,button:d,buttonName:h,popup:b,popupName:f.popupName,command:i,value:g,useCSS:j};if(!(f.popupClick&&f.popupClick(a,b)===false)){if(b.command&&!v(this,b.command,b.value,b.useCSS,d))return false;r();w(this)}}}function C(a){for(var b=1,c=0,d=0;d"+g+"")});else if(a=="style")e.each(b.styles,function(i, -g){e(m).appendTo(f).html(g[1]+g[0]+g[1].replace("<","
');c=B}else if(a=="pastetext"){f.html("Paste your content here and click submit.

");c=B}if(!c&&!d)c=S;f.addClass(c);l&&f.attr(I,"on").find("div,font,p,h1,h2,h3,h4,h5,h6").attr(I,"on");if(f.hasClass(S)||h===true)f.children().hover(O,P);p[a]=f[0]; -return f[0]}function T(a,b){if(b){a.$area.attr(n,n);a.disabled=true}else{a.$area.removeAttr(n);delete a.disabled}try{if(l)a.doc.body.contentEditable=!b;else a.doc.designMode=!b?"on":"off"}catch(c){}u(a)}function v(a,b,c,d,h){D(a);if(!l){if(d===undefined||d===null)d=a.options.useCSS;a.doc.execCommand("styleWithCSS",0,d.toString())}d=true;var f;if(l&&b.toLowerCase()=="inserthtml")y(a).pasteHTML(c);else{try{d=a.doc.execCommand(b,0,c||null)}catch(i){f=i.description;d=false}d||("cutcopypaste".indexOf(b)> --1?z(a,"For security reasons, your browser does not support the "+b+" command. Try using the keyboard shortcut or context menu instead.",h):z(a,f?f:"Error executing the "+b+" command.",h))}u(a);return d}function w(a){setTimeout(function(){t(a)?a.$area.focus():a.$frame[0].contentWindow.focus();u(a)},0)}function y(a){if(l)return J(a).createRange();return J(a).getRangeAt(0)}function J(a){if(l)return a.doc.selection;return a.$frame[0].contentWindow.getSelection()}function Q(a){var b=/rgba?\((\d+), (\d+), (\d+)/.exec(a), -c=a.split("");if(b)for(a=(b[1]<<16|b[2]<<8|b[3]).toString(16);a.length<6;)a="0"+a;return"#"+(a.length==6?a:c[1]+c[1]+c[2]+c[2]+c[3]+c[3])}function r(){e.each(p,function(a,b){e(b).hide().unbind(q).removeData(A)})}function U(){var a=e("link[href$='jquery.cleditor.css']").attr("href");return a.substr(0,a.length-19)+"images/"}function K(a){var b=a.$main,c=a.options;a.$frame&&a.$frame.remove();var d=a.$frame=e('