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: 2
Merge reported by: Pablo Rubianes
Merged at revision: not available
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+105294@code.launchpad.net

Commit message

se modificaron imagenes (gez) y ademas se agrego a grafica libre

Description of the change

se modificaron imagenes (gez) y ademas se agrego a grafica libre

To post a comment you must log in.
Revision history for this message
Pablo Rubianes (pablorubianes-uy) :
review: Approve
lp:~pablorubianes-uy/ubuconla-web/trunk updated
3. By Pablo Rubianes

merge de cambios de registro

4. By Pablo Rubianes

registracion y otros arreglos

5. By Pablo Rubianes

modificacion a pedido de Guillermo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'aside.html'
--- aside.html 2012-05-08 02:00:19 +0000
+++ aside.html 2012-05-12 18:26:17 +0000
@@ -17,6 +17,16 @@
17 <a href="http://www.cronon.com.ar/"><img class="cronon" src="/images/logo_cronon.png"></a>17 <a href="http://www.cronon.com.ar/"><img class="cronon" src="/images/logo_cronon.png"></a>
18 </td>18 </td>
19 </tr>19 </tr>
20 <tr>
21 <td>
22 <a href="http://www.graficalibre.org"><img class="cronon" src="/images/logo_graficalibre.png"></a>
23 </td>
24 </tr>
25 <tr>
26 <td>
27 <a href="http://www.cadesol.org.ar"><img class="cadesol" src="/images/cadesol_logo.png"></a>
28 </td>
29 </tr>
20 </tbody>30 </tbody>
21 </table>31 </table>
22 </aside>32 </aside>
23\ No newline at end of file33\ No newline at end of file
2434
=== modified file 'charlas.php'
--- charlas.php 2012-05-08 02:00:19 +0000
+++ charlas.php 2012-05-12 18:26:17 +0000
@@ -1,5 +1,4 @@
1<!DOCTYPE html>1<!DOCTYPE html>
2<?php header('Content-Type: text/html; charset=utf-8'); ?>
3<html>2<html>
4 <?php include ("head.html"); ?>3 <?php include ("head.html"); ?>
5 <body>4 <body>
65
=== added file 'css/registracion.css'
--- css/registracion.css 1970-01-01 00:00:00 +0000
+++ css/registracion.css 2012-05-12 18:26:17 +0000
@@ -0,0 +1,14 @@
1aside{
2 background-color: #d6d3cf;
3 width:263px;
4 height:639px;
5 margin: -18px 0px 0px 597px;
6}
7.registracion {
8 margin: -638px 0px 0px 0px!important;
9 height: 100%!important;
10}
11.contentmapa{
12 margin: -658px 0px 0px 0px!important;
13 locheight: 100%!important;
14}
0\ No newline at end of file15\ No newline at end of file
116
=== modified file 'css/style.css'
--- css/style.css 2012-05-10 19:42:06 +0000
+++ css/style.css 2012-05-12 18:26:17 +0000
@@ -58,11 +58,6 @@
58 padding: 0px 0px 0px 0px;58 padding: 0px 0px 0px 0px;
59}59}
6060
61.registracion {
62 margin: -500px 0px 0px 0px!important;
63 height: 100%!important;
64}
65
66.fotoh{61.fotoh{
67 width:860px;62 width:860px;
68 margin: 0px 0px -3px 0px;63 margin: 0px 0px -3px 0px;
@@ -71,6 +66,9 @@
71 height:3px;66 height:3px;
72 background-color: #2e2e2e;67 background-color: #2e2e2e;
73}68}
69.mapa{
70 margin: -7px 0px 13px 85px;;
71}
7472
75/*############## Fotos ###################*/73/*############## Fotos ###################*/
76.canonical{74.canonical{
@@ -86,7 +84,12 @@
86.cronon{84.cronon{
87 width:102px;85 width:102px;
88 height:58px;86 height:58px;
89 margin:0 71px;87 margin:1px 71px;
88}
89.cadesol{
90 /*width:100px;
91 height:40px;*/
92 margin:4px 71px;
90}93}
91.uy{94.uy{
92 width:141px;95 width:141px;
9396
=== modified file 'donde.php'
--- donde.php 2012-05-08 02:00:19 +0000
+++ donde.php 2012-05-12 18:26:17 +0000
@@ -1,18 +1,18 @@
1<!DOCTYPE html>1<!DOCTYPE html>
2<?php header('Content-Type: text/html; charset=utf-8'); ?>2<?php header('Content-Type: text/html; charset=utf-8'); ?>
3<html>3<html>
4 <?php include ("head.html"); ?>4 <?php include ("head_aside_long.html"); ?>
5 <body>5 <body>
6 <?php include ("menu.html"); ?>6 <?php include ("menu.html"); ?>
7 <?php include ("aside.html"); ?>7 <?php include ("aside.html"); ?>
8 <div class="content">8 <div class="content contentmapa">
9 <h1>¿Dónde, cuándo y cómo ?</h1>9 <h1>¿Dónde, cuándo y cómo ?</h1>
10 <h2>¿Qué es UbuConLA?</h2>10 <h2>¿Qué es UbuConLA?</h2>
11 11
12 <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>12 <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>
1313
14 <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>14 <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>
15 </ul>15 <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>
16 </div>16 </div>
17 <?php include("foot.html"); ?>17 <?php include("foot.html"); ?>
18 </body>18 </body>
1919
=== added file 'head_aside_long.html'
--- head_aside_long.html 1970-01-01 00:00:00 +0000
+++ head_aside_long.html 2012-05-12 18:26:17 +0000
@@ -0,0 +1,8 @@
1 <head>
2 <title>UbuConLA 2012</title>
3 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
5 <link rel="stylesheet" type="text/css" href="css/style.css">
6 <link rel="stylesheet" type="text/css" href="css/registracion.css">
7 <link rel="shortcut icon" href="/images/favicon.ico">
8 </head>
0\ No newline at end of file9\ No newline at end of file
110
=== added file 'images/cadesol_logo.png'
2Binary files images/cadesol_logo.png 1970-01-01 00:00:00 +0000 and images/cadesol_logo.png 2012-05-12 18:26:17 +0000 differ11Binary files images/cadesol_logo.png 1970-01-01 00:00:00 +0000 and images/cadesol_logo.png 2012-05-12 18:26:17 +0000 differ
=== modified file 'images/footer.png'
3Binary files images/footer.png 2012-05-08 02:00:19 +0000 and images/footer.png 2012-05-12 18:26:17 +0000 differ12Binary files images/footer.png 2012-05-08 02:00:19 +0000 and images/footer.png 2012-05-12 18:26:17 +0000 differ
=== added file 'images/foto_subheader.jpg'
4Binary files images/foto_subheader.jpg 1970-01-01 00:00:00 +0000 and images/foto_subheader.jpg 2012-05-12 18:26:17 +0000 differ13Binary files images/foto_subheader.jpg 1970-01-01 00:00:00 +0000 and images/foto_subheader.jpg 2012-05-12 18:26:17 +0000 differ
=== modified file 'images/header.png' (properties changed: +x to -x)
5Binary files images/header.png 2012-05-08 02:00:19 +0000 and images/header.png 2012-05-12 18:26:17 +0000 differ14Binary files images/header.png 2012-05-08 02:00:19 +0000 and images/header.png 2012-05-12 18:26:17 +0000 differ
=== modified file 'images/logo_austral.png'
6Binary files images/logo_austral.png 2012-05-08 02:00:19 +0000 and images/logo_austral.png 2012-05-12 18:26:17 +0000 differ15Binary files images/logo_austral.png 2012-05-08 02:00:19 +0000 and images/logo_austral.png 2012-05-12 18:26:17 +0000 differ
=== modified file 'images/logo_canonical.png'
7Binary files images/logo_canonical.png 2012-05-08 02:00:19 +0000 and images/logo_canonical.png 2012-05-12 18:26:17 +0000 differ16Binary files images/logo_canonical.png 2012-05-08 02:00:19 +0000 and images/logo_canonical.png 2012-05-12 18:26:17 +0000 differ
=== modified file 'images/logo_cronon.png'
8Binary files images/logo_cronon.png 2012-05-08 02:00:19 +0000 and images/logo_cronon.png 2012-05-12 18:26:17 +0000 differ17Binary files images/logo_cronon.png 2012-05-08 02:00:19 +0000 and images/logo_cronon.png 2012-05-12 18:26:17 +0000 differ
=== added file 'images/logo_graficalibre.png'
9Binary files images/logo_graficalibre.png 1970-01-01 00:00:00 +0000 and images/logo_graficalibre.png 2012-05-12 18:26:17 +0000 differ18Binary files images/logo_graficalibre.png 1970-01-01 00:00:00 +0000 and images/logo_graficalibre.png 2012-05-12 18:26:17 +0000 differ
=== modified file 'index.php'
--- index.php 2012-05-08 02:00:19 +0000
+++ index.php 2012-05-12 18:26:17 +0000
@@ -1,4 +1,5 @@
1<!DOCTYPE html>1<!DOCTYPE html>
2<?php header('Content-Type: text/html; charset=utf-8'); ?>
2<html>3<html>
3 <?php include ("head.html"); ?>4 <?php include ("head.html"); ?>
4 <body>5 <body>
@@ -19,4 +20,4 @@
19 </div>20 </div>
20 <?php include("foot.html"); ?>21 <?php include("foot.html"); ?>
21 </body>22 </body>
22</html>
23\ No newline at end of file23\ No newline at end of file
24</html>
2425
=== modified file 'menu.html'
--- menu.html 2012-05-10 19:42:06 +0000
+++ menu.html 2012-05-12 18:26:17 +0000
@@ -1,7 +1,7 @@
1 <div class="todo">1 <div class="todo">
2 <header>2 <header>
3 <img class="fotoh" src="/images/head.png">3 <img class="fotoh" src="/images/header.png">
4 <img class="fotoh" src="/images/subhead.png">4 <img class="fotoh" src="/images/foto_subheader.jpg">
5 </header>5 </header>
6 <!-- Contenido -->6 <!-- Contenido -->
7 <div class="menu">7 <div class="menu">
88
=== modified file 'registrarse.php'
--- registrarse.php 2012-05-10 19:42:06 +0000
+++ registrarse.php 2012-05-12 18:26:17 +0000
@@ -1,7 +1,7 @@
1<!DOCTYPE html>1<!DOCTYPE html>
2<?php header('Content-Type: text/html; charset=utf-8'); ?>2<?php header('Content-Type: text/html; charset=utf-8'); ?>
3<html>3<html>
4 <?php include ("head.html"); ?>4 <?php include ("head_aside_long.html"); ?>
5 <body>5 <body>
6 <?php include ("menu.html"); ?>6 <?php include ("menu.html"); ?>
7 <?php include ("aside.html"); ?>7 <?php include ("aside.html"); ?>
88
=== removed directory 'trunk'

Subscribers

People subscribed via source and target branches

to all changes: