From: Jef van Schendel Date: Fri, 13 May 2011 20:34:26 +0000 (-0500) Subject: Added header to base.html X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a0f823e51c575e10430be1a2f3c439eef23d06b;p=mediagoblin.git Added header to base.html --- 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 @@ {% block mediagoblin_body %} {% block mediagoblin_header %} - - - - - - - - - + {% endblock %} {% if request.user %} - - - - {% else %} - - - - {% endif %} -
{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
+ {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %} {% block mediagoblin_header_subtitle %} Clever subtitle here! - {% endblock %}
Welcome {{ request.user['username'] }}! -- Logout -
Login -
+ + {% endblock %} -
+
{% block mediagoblin_content %} {% endblock mediagoblin_content %}
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 @@ {% block mediagoblin_body %} {% block mediagoblin_header %} - - - - - - - - - + {% endblock %} {% if request.user %} - - - - {% else %} - - - - {% endif %} -
{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
+ {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %} {% block mediagoblin_header_subtitle %} Clever subtitle here! - {% endblock %}
Welcome {{ request.user['username'] }}! -- Logout -
Login -
+
+ {% endblock %} -
+
{% block mediagoblin_content %} {% endblock mediagoblin_content %}