projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8d2a42d)
Added header to base.html
authorJef van Schendel <jefvanschendel@gmail.com>
Fri, 13 May 2011 20:34:26 +0000 (15:34 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 13 May 2011 20:34:26 +0000 (15:34 -0500)
mediagoblin/static/css/base.css patch | blob | blame | history
mediagoblin/static/css/base.css~ patch | blob | blame | history
mediagoblin/templates/mediagoblin/base.html patch | blob | blame | history
mediagoblin/templates/mediagoblin/base.html~ patch | blob | blame | history

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 3576fd1ffb5280b29db985c8a804e55abeeae62f..3b6abd3e19da67e553e01d3dee76cf86fb3e8147 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -28,15 +28,15 @@ a {
     text-decoration: none;
 }
 
-.header {
+.mediagoblin_header {
     width:100%;
     height:60px;
-    background-image:url('header_back.png');
+    background-image:url('../images/header_back.png');
     padding-top:40px;
     margin-bottom:80px;
 }
 
-.container {
+.mediagoblin_content {
     width: 800px;
     margin-left: auto;
     margin-right: auto;
diff --git a/mediagoblin/static/css/base.css~ b/mediagoblin/static/css/base.css~
index e69a87e7de7179ac0455a312cb1d570fd90c3175..3b6abd3e19da67e553e01d3dee76cf86fb3e8147 100644 (file)
--- a/mediagoblin/static/css/base.css~
+++ b/mediagoblin/static/css/base.css~
@@ -28,15 +28,15 @@ a {
     text-decoration: none;
 }
 
-.header {
+.mediagoblin_header {
     width:100%;
     height:60px;
-    background-image:url('header_back.png');
+    background-image:url('../images/header_back.png');
     padding-top:40px;
     margin-bottom:80px;
 }
 
-.container {
+.mediagoblin_content {
     width: 800px;
     margin-left: auto;
     margin-right: auto;
@@ -61,10 +61,10 @@ a {
 }
 
 .button_red {
-    background-image: url('button_red.png');
+    background-image: url('../images/button_red.png');
 }
 
 .button_green {
-    background-image: url('button_green.png');
+    background-image: url('../images/button_green.png');
 }
 
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index d73d8c20df66533a298150698d4fe03604bedaff..4b634cf170c4b8f1ea401c2d513a7e30941dada7 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -25,43 +25,26 @@
   <body>
     {% block mediagoblin_body %}
       {% block mediagoblin_header %}
-        <table id="mediagoblin_header">
-          <tr>
-            <td id="mediagoblin_logo">
+      <div class="mediagoblin_header">
+      <div class="mediagoblin_content">
               {% block mediagoblin_logo %}
                 <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
-              {% endblock %}
-            </td>
-            <td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td>
+              {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
               {% block mediagoblin_header_subtitle %}
                 Clever subtitle here!
-              {% endblock %}</td>
-          </tr>
+              {% endblock %}
           {% if request.user %}
-            <tr>
-              <td></td>
-              <td>
                 Welcome {{ request.user['username'] }}! --
                 <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
                   Logout</a>
-              </td>
-            </tr>
           {% else %}
-            <tr>
-              <td></td>
-              <td>
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
                   Login</a>
-              </td>
-            </tr>
           {% endif %}
-        </table>
+      </div>
+      </div>
       {% endblock %}
-      <div id="mediagoblin_content">
+      <div class="mediagoblin_content">
         {% block mediagoblin_content %}
         {% endblock mediagoblin_content %}
       </div>
diff --git a/mediagoblin/templates/mediagoblin/base.html~ b/mediagoblin/templates/mediagoblin/base.html~
index d73d8c20df66533a298150698d4fe03604bedaff..4b634cf170c4b8f1ea401c2d513a7e30941dada7 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html~
+++ b/mediagoblin/templates/mediagoblin/base.html~
@@ -25,43 +25,26 @@
   <body>
     {% block mediagoblin_body %}
       {% block mediagoblin_header %}
-        <table id="mediagoblin_header">
-          <tr>
-            <td id="mediagoblin_logo">
+      <div class="mediagoblin_header">
+      <div class="mediagoblin_content">
               {% block mediagoblin_logo %}
                 <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
-              {% endblock %}
-            </td>
-            <td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td>
+              {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
               {% block mediagoblin_header_subtitle %}
                 Clever subtitle here!
-              {% endblock %}</td>
-          </tr>
+              {% endblock %}
           {% if request.user %}
-            <tr>
-              <td></td>
-              <td>
                 Welcome {{ request.user['username'] }}! --
                 <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
                   Logout</a>
-              </td>
-            </tr>
           {% else %}
-            <tr>
-              <td></td>
-              <td>
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
                   Login</a>
-              </td>
-            </tr>
           {% endif %}
-        </table>
+      </div>
+      </div>
       {% endblock %}
-      <div id="mediagoblin_content">
+      <div class="mediagoblin_content">
         {% block mediagoblin_content %}
         {% endblock mediagoblin_content %}
       </div>
Unnamed repository; edit this file 'description' to name the repository.