ubuconla-web

Merge lp:~pablorubianes-uy/ubuconla-web/trunk into lp:ubuconla-web/2012

  1. trunk
  2. Merge into 2012
Proposed by Pablo Rubianes
Status: Merged
Approved by: Pablo Rubianes
Approved revision: 5
Merged at revision: 5
Proposed branch: lp:~pablorubianes-uy/ubuconla-web/trunk
Merge into: lp:ubuconla-web/2012
Diff against target: 194 lines (+50/-15)
9 files modified
aside.html (+10/-0)
charlas.php (+0/-1)
css/registracion.css (+14/-0)
css/style.css (+9/-6)
donde.php (+4/-4)
head_aside_long.html (+8/-0)
index.php (+2/-1)
menu.html (+2/-2)
registrarse.php (+1/-1)
To merge this branch: bzr merge lp:~pablorubianes-uy/ubuconla-web/trunk
Reviewer Review Type Date Requested Status
Pablo Rubianes Approve
Review via email: mp+105564@code.launchpad.net

Commit message

merge 2

Description of the change

modificaciones varias de los ultimos dias:
registracion,
mapa de donde
y otras cosas.

To post a comment you must log in.
Revision history for this message
Pablo Rubianes (pablorubianes-uy) wrote :

merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'aside.html'
2--- aside.html 2012-05-08 02:00:19 +0000
3+++ aside.html 2012-05-12 18:32:19 +0000
4@@ -17,6 +17,16 @@
5 <a href="http://www.cronon.com.ar/"><img class="cronon" src="/images/logo_cronon.png"></a>
6 </td>
7 </tr>
8+ <tr>
9+ <td>
10+ <a href="http://www.graficalibre.org"><img class="cronon" src="/images/logo_graficalibre.png"></a>
11+ </td>
12+ </tr>
13+ <tr>
14+ <td>
15+ <a href="http://www.cadesol.org.ar"><img class="cadesol" src="/images/cadesol_logo.png"></a>
16+ </td>
17+ </tr>
18 </tbody>
19 </table>
20 </aside>
21\ No newline at end of file
22
23=== modified file 'charlas.php'
24--- charlas.php 2012-05-08 02:00:19 +0000
25+++ charlas.php 2012-05-12 18:32:19 +0000
26@@ -1,5 +1,4 @@
27 <!DOCTYPE html>
28-<?php header('Content-Type: text/html; charset=utf-8'); ?>
29 <html>
30 <?php include ("head.html"); ?>
31 <body>
32
33=== added file 'css/registracion.css'
34--- css/registracion.css 1970-01-01 00:00:00 +0000
35+++ css/registracion.css 2012-05-12 18:32:19 +0000
36@@ -0,0 +1,14 @@
37+aside{
38+ background-color: #d6d3cf;
39+ width:263px;
40+ height:639px;
41+ margin: -18px 0px 0px 597px;
42+}
43+.registracion {
44+ margin: -638px 0px 0px 0px!important;
45+ height: 100%!important;
46+}
47+.contentmapa{
48+ margin: -658px 0px 0px 0px!important;
49+ locheight: 100%!important;
50+}
51\ No newline at end of file
52
53=== modified file 'css/style.css'
54--- css/style.css 2012-05-10 19:42:06 +0000
55+++ css/style.css 2012-05-12 18:32:19 +0000
56@@ -58,11 +58,6 @@
57 padding: 0px 0px 0px 0px;
58 }
59
60-.registracion {
61- margin: -500px 0px 0px 0px!important;
62- height: 100%!important;
63-}
64-
65 .fotoh{
66 width:860px;
67 margin: 0px 0px -3px 0px;
68@@ -71,6 +66,9 @@
69 height:3px;
70 background-color: #2e2e2e;
71 }
72+.mapa{
73+ margin: -7px 0px 13px 85px;;
74+}
75
76 /*############## Fotos ###################*/
77 .canonical{
78@@ -86,7 +84,12 @@
79 .cronon{
80 width:102px;
81 height:58px;
82- margin:0 71px;
83+ margin:1px 71px;
84+}
85+.cadesol{
86+ /*width:100px;
87+ height:40px;*/
88+ margin:4px 71px;
89 }
90 .uy{
91 width:141px;
92
93=== modified file 'donde.php'
94--- donde.php 2012-05-08 02:00:19 +0000
95+++ donde.php 2012-05-12 18:32:19 +0000
96@@ -1,18 +1,18 @@
97 <!DOCTYPE html>
98 <?php header('Content-Type: text/html; charset=utf-8'); ?>
99 <html>
100- <?php include ("head.html"); ?>
101+ <?php include ("head_aside_long.html"); ?>
102 <body>
103 <?php include ("menu.html"); ?>
104 <?php include ("aside.html"); ?>
105- <div class="content">
106+ <div class="content contentmapa">
107 <h1>¿Dónde, cuándo y cómo ?</h1>
108 <h2>¿Qué es UbuConLA?</h2>
109
110 <p>La conferencia se realizará los días 1 y 2 de Junio 2012 en la sede de la Ciudad de Buenos Aires de la Universidad Austral, en Argentina.</p>
111
112- <p>La asistencia es libre y gratuita pero por llevarse a cabo en un ámbito privado, tanto la Organización de las jornadas como las autoridades de la Universidad Austral se reservan el derecho de ingreso y permanencia.</p>
113- </ul>
114+ <p>La asistencia es libre y gratuita pero por llevarse a cabo en un ámbito privado, tanto la Organización de las jornadas como las autoridades de la Universidad Austral se reservan el derecho de permanencia. <a href="/registracion.php">Registrate!</a></p>
115+ <iframe class="mapa" width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?q=universidad+austral,+Avenida+Juan+de+Garay,+Buenos+Aires,+Argentina&amp;hl=en&amp;hq=universidad+austral,+Avenida+Juan+de+Garay,+Buenos+Aires,+Argentina&amp;t=m&amp;ie=UTF8&amp;ll=-34.614491,-58.365555&amp;spn=0.024723,0.036478&amp;z=14&amp;iwloc=A&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?q=universidad+austral,+Avenida+Juan+de+Garay,+Buenos+Aires,+Argentina&amp;hl=en&amp;hq=universidad+austral,+Avenida+Juan+de+Garay,+Buenos+Aires,+Argentina&amp;t=m&amp;ie=UTF8&amp;ll=-34.614491,-58.365555&amp;spn=0.024723,0.036478&amp;z=14&amp;iwloc=A&amp;source=embed" style="color:#0000FF;text-align:left">View Larger Map</a></small>
116 </div>
117 <?php include("foot.html"); ?>
118 </body>
119
120=== added file 'head_aside_long.html'
121--- head_aside_long.html 1970-01-01 00:00:00 +0000
122+++ head_aside_long.html 2012-05-12 18:32:19 +0000
123@@ -0,0 +1,8 @@
124+ <head>
125+ <title>UbuConLA 2012</title>
126+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
127+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
128+ <link rel="stylesheet" type="text/css" href="css/style.css">
129+ <link rel="stylesheet" type="text/css" href="css/registracion.css">
130+ <link rel="shortcut icon" href="/images/favicon.ico">
131+ </head>
132\ No newline at end of file
133
134=== added file 'images/cadesol_logo.png'
135Binary files images/cadesol_logo.png 1970-01-01 00:00:00 +0000 and images/cadesol_logo.png 2012-05-12 18:32:19 +0000 differ
136=== modified file 'images/footer.png'
137Binary files images/footer.png 2012-05-08 02:00:19 +0000 and images/footer.png 2012-05-12 18:32:19 +0000 differ
138=== added file 'images/foto_subheader.jpg'
139Binary files images/foto_subheader.jpg 1970-01-01 00:00:00 +0000 and images/foto_subheader.jpg 2012-05-12 18:32:19 +0000 differ
140=== modified file 'images/header.png' (properties changed: +x to -x)
141Binary files images/header.png 2012-05-08 02:00:19 +0000 and images/header.png 2012-05-12 18:32:19 +0000 differ
142=== modified file 'images/logo_austral.png'
143Binary files images/logo_austral.png 2012-05-08 02:00:19 +0000 and images/logo_austral.png 2012-05-12 18:32:19 +0000 differ
144=== modified file 'images/logo_canonical.png'
145Binary files images/logo_canonical.png 2012-05-08 02:00:19 +0000 and images/logo_canonical.png 2012-05-12 18:32:19 +0000 differ
146=== modified file 'images/logo_cronon.png'
147Binary files images/logo_cronon.png 2012-05-08 02:00:19 +0000 and images/logo_cronon.png 2012-05-12 18:32:19 +0000 differ
148=== added file 'images/logo_graficalibre.png'
149Binary files images/logo_graficalibre.png 1970-01-01 00:00:00 +0000 and images/logo_graficalibre.png 2012-05-12 18:32:19 +0000 differ
150=== modified file 'index.php'
151--- index.php 2012-05-08 02:00:19 +0000
152+++ index.php 2012-05-12 18:32:19 +0000
153@@ -1,4 +1,5 @@
154 <!DOCTYPE html>
155+<?php header('Content-Type: text/html; charset=utf-8'); ?>
156 <html>
157 <?php include ("head.html"); ?>
158 <body>
159@@ -19,4 +20,4 @@
160 </div>
161 <?php include("foot.html"); ?>
162 </body>
163-</html>
164\ No newline at end of file
165+</html>
166
167=== modified file 'menu.html'
168--- menu.html 2012-05-10 19:42:06 +0000
169+++ menu.html 2012-05-12 18:32:19 +0000
170@@ -1,7 +1,7 @@
171 <div class="todo">
172 <header>
173- <img class="fotoh" src="/images/head.png">
174- <img class="fotoh" src="/images/subhead.png">
175+ <img class="fotoh" src="/images/header.png">
176+ <img class="fotoh" src="/images/foto_subheader.jpg">
177 </header>
178 <!-- Contenido -->
179 <div class="menu">
180
181=== modified file 'registrarse.php'
182--- registrarse.php 2012-05-10 19:42:06 +0000
183+++ registrarse.php 2012-05-12 18:32:19 +0000
184@@ -1,7 +1,7 @@
185 <!DOCTYPE html>
186 <?php header('Content-Type: text/html; charset=utf-8'); ?>
187 <html>
188- <?php include ("head.html"); ?>
189+ <?php include ("head_aside_long.html"); ?>
190 <body>
191 <?php include ("menu.html"); ?>
192 <?php include ("aside.html"); ?>
193
194=== removed directory 'trunk'

Subscribers

People subscribed via source and target branches

to all changes: