butando um layout melhor =)
authorLincoln de Sousa <pythonwarrior@pidinti.localdomain>
Mon, 13 Aug 2007 19:32:03 +0000 (16:32 -0300)
committerLincoln de Sousa <pythonwarrior@pidinti.localdomain>
Mon, 13 Aug 2007 19:32:03 +0000 (16:32 -0300)
media/css/geral.css
media/imgs/logo.png
templates/base.html

index 66511a0..d22bc0f 100644 (file)
@@ -7,10 +7,9 @@ body {
 h1.title {
     color: #f00;
     background: url(/site_media/imgs/logo.png) no-repeat;
-    width: 156px;
+    width: 471px;
     height: 190px;
     overflow: hidden;
-    float: left;
 }
 
 h1.title a {
@@ -35,22 +34,25 @@ em {
     color: #999;
 }
 
+a {
+    color: #cc0000;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
 #headsection {
     border: solid 1px #f7f7f7;
-    background: #d7d7d7;
+    background: #e4e4e4;
     padding: 0px 60px 0px 60px;
-    /*padding: 8px;*/
 }
 
-#right-box {
+#login-form {
     position: absolute;
     right: 60px;
-    top: 10px;
-    width: 200px;
-    border: solid 1px blue;
-}
-
-#login-form {
+    top: 155px;
 }
 
 #login-form label {
@@ -66,21 +68,52 @@ em {
     width: 40px;
 }
 
+#menu-palestrante {
+    position: absolute;
+    right: 60px;
+    top: 55px;
+}
+
+#menu-palestrante ul {
+    padding-left: 15px;
+    margin: 0px;
+    list-style-type: square;
+}
+
+#main-menu li {
+}
+
 #menu {
     list-style-type: none;
     list-style-image: none;
     padding: 0px;
-    margin-top: 180px;
-    margin-left: 200px;
+    margin: 0px;
+    background-color: #cc0000;
+    padding: 5px 60px 5px 60px;
 }
 
 #menu li {
     display: inline;
+    padding-right: 15px;
+}
+
+#menu li a {
+    text-transform: uppercase;
+    text-decoration: none;
+    font-weight: bold;
+    color: white;
 }
 
 #content {
-    padding: 5px;
-    margin: 0px 60px 0px 60px;
+    padding: 0px;
+    margin: 20px 60px 0px 60px;
+}
+
+#footer {
+    margin: 25px 60px 5px 60px;
+    padding-top: 10px;
+    border-top: solid 1px #c00;
+    text-align: center;
 }
 
 #news {
index ac3c6bb..327804d 100644 (file)
Binary files a/media/imgs/logo.png and b/media/imgs/logo.png differ
index 7252012..54c6e22 100644 (file)
     <body>
         <div id="headsection">
             <h1 class="title"><a href="/">Encontro Mineiro de Software Livre</a></h1>
-            <div id="right-box">
 
-                {% if user.is_authenticated %}
-                <ul id="main-menu">
+            {% if user.is_authenticated %}
+            <div id="menu-palestrante">
+                <h3>Menu do palestrante</h3>
+                <ul>
+                    <li><a href="/meus_trabalhos">Meus trabalhos inscritos</a></li>
                     <li><a href="/inscrever_palestra">Inscreva uma palestra</a></li>
                     <li><a href="/inscrever_minicurso">Inscreva um minicurso</a></li>
                     <li><a href="/logout">Sair</a></li>
                 </ul>
+            </div>
 
-                {% else %}
-
-                <form id="login-form" method="post" action=".">
-                    <h3>Login</h3>
-                    <div class="field">
-                        <label for="id_username">Usuário:</label>
-                        <input id="id_username" class="vTextField required" type="text"
-                               maxlength="30" name="username" />
-                    </div>
-                    <div class="field">
-                        <label for="id_password-login">Senha:</label>
-                        <input id="id_password-login" class="vTextField required"
-                               type="password" name="password" />
+            {% else %}
 
-                        <input type="submit" value="Login" class="submit" name="submitting_login_form" />
-                    </div>
+            <form id="login-form" method="post" action=".">
+                <div class="field">
+                    <label for="id_username">Usuário:</label>
+                    <input id="id_username" class="vTextField required" type="text"
+                           maxlength="30" name="username" />
+                </div>
+                <div class="field">
+                    <label for="id_password-login">Senha:</label>
+                    <input id="id_password-login" class="vTextField required"
+                           type="password" name="password" />
 
-                    <a href="/cadastro">Cadastre-se</a>
-                </form>
-                {% endif %}
+                    <input type="submit" value="Login" class="submit" name="submitting_login_form" />
+                </div>
+            </form>
+            {% endif %}
 
-            </div>
+        </div>
 
-            <ul id="menu">
-                <li><a href="/inscricao">Inscrição</a></li>
+        <ul id="menu">
+            <li><a href="/inscricao">Inscrição</a></li>
+            <li><a href="/programacao">Programação</a></li>
 
-                {% for i in menu %}
-                <li><a href="/secao/{{ i.secao.id }}">{{ i.titulo }}</a></li>
-                {% endfor %}
-            </ul>
-            <br style="clear: both;" />
-        </div>
+            {% for i in menu %}
+            <li><a href="/secao/{{ i.secao.id }}">{{ i.titulo }}</a></li>
+            {% endfor %}
+        </ul>
 
         <div id="content">
         {% block content %}{% endblock %}