diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 6 | ||||
| -rw-r--r-- | mediagoblin/static/css/base.css~ | 10 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 31 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html~ | 31 |
4 files changed, 22 insertions, 56 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 3576fd1f..3b6abd3e 100644 --- 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 e69a87e7..3b6abd3e 100644 --- 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 d73d8c20..4b634cf1 100644 --- 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 d73d8c20..4b634cf1 100644 --- 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> |