diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-09-29 10:12:01 -0300 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-09-29 10:12:01 -0300 |
commit | 76a250e3e31999585c30030cfacbd5e91d6fafdb (patch) | |
tree | e0889c161692570eb265bc5c85c05b9a884b5804 | |
parent | 0269c45846625b762aee1d3d98be236dba119594 (diff) | |
parent | 14e2096c6dadd3075c3d3f2e26f1a7eff8495612 (diff) | |
download | askbot-76a250e3e31999585c30030cfacbd5e91d6fafdb.tar.gz askbot-76a250e3e31999585c30030cfacbd5e91d6fafdb.tar.bz2 askbot-76a250e3e31999585c30030cfacbd5e91d6fafdb.zip |
Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into new-template
-rw-r--r-- | askbot/locale/es/LC_MESSAGES/django.po | 41 | ||||
-rw-r--r-- | askbot/skins/default/media/images/logo.gif | bin | 2272 -> 3933 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/sprites.png | bin | 0 -> 6090 bytes | |||
-rw-r--r-- | askbot/skins/default/media/style/style.css | 343 | ||||
-rw-r--r-- | askbot/skins/default/templates/base.html | 4 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/header.html | 16 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/secundary_header.html | 3 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/system_messages.html | 4 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/user_navigation.html (renamed from askbot/skins/default/templates/blocks/header_meta_links.html) | 3 |
9 files changed, 223 insertions, 191 deletions
diff --git a/askbot/locale/es/LC_MESSAGES/django.po b/askbot/locale/es/LC_MESSAGES/django.po index 869b3d58..2e135592 100644 --- a/askbot/locale/es/LC_MESSAGES/django.po +++ b/askbot/locale/es/LC_MESSAGES/django.po @@ -119,11 +119,11 @@ msgstr "" #: forms.py:175 const/__init__.py:219 msgid "approved" -msgstr "" +msgstr "aprobado" #: forms.py:176 const/__init__.py:220 msgid "watched" -msgstr "" +msgstr "visto" #: forms.py:177 const/__init__.py:221 #, fuzzy @@ -132,7 +132,7 @@ msgstr "actualizado" #: forms.py:178 const/__init__.py:222 msgid "blocked" -msgstr "" +msgstr "bloqueado" #: forms.py:180 const/__init__.py:218 #, fuzzy @@ -155,11 +155,11 @@ msgstr "no se puede votar por sus propias publicaciones" #: forms.py:254 msgid "Cannot turn other user to moderator" -msgstr "" +msgstr "No tiene permitido habilitar a otros usuarios como moderadores" #: forms.py:261 msgid "Cannot change status of another moderator" -msgstr "No esta permitido cambiar el estado de otro moderador" +msgstr "No tiene permitido cambiar el estado de otro moderador" #: forms.py:267 #, python-format @@ -168,7 +168,7 @@ msgstr "" #: forms.py:276 msgid "Subject line" -msgstr "" +msgstr "Sujeto" #: forms.py:283 msgid "Message text" @@ -401,12 +401,12 @@ msgstr "" #: conf/email.py:47 msgid "Require email verification before allowing to post" -msgstr "" +msgstr "Es requerida una verificación via email antes de poder publicar" #: conf/email.py:48 msgid "" "Active email verification is done by sending a verification key in email" -msgstr "" +msgstr "Se ha comenzado el proceso de verificación con una llave enviada a su correo electrónico" #: conf/email.py:57 #, fuzzy @@ -423,7 +423,7 @@ msgstr "" #: conf/email.py:76 msgid "Prefix for the email subject line" -msgstr "" +msgstr "Prefijo para el campo de correo electrónico" #: conf/external_keys.py:11 msgid "Keys to connect the site with external services like Facebook, etc." @@ -431,7 +431,7 @@ msgstr "" #: conf/external_keys.py:18 msgid "Google site verification key" -msgstr "" +msgstr "Llave de verificación de Google site" #: conf/external_keys.py:20 #, python-format @@ -442,7 +442,7 @@ msgstr "" #: conf/external_keys.py:34 msgid "Google Analytics key" -msgstr "" +msgstr "LLave de Googne Analytics" #: conf/external_keys.py:36 #, python-format @@ -453,8 +453,7 @@ msgstr "" #: conf/external_keys.py:49 msgid "Enable recaptcha (keys below are required)" -msgstr "" - +msgstr "Habilitar recaptcha (las llaves de abajo son requeridas)" #: conf/external_keys.py:58 msgid "Recaptcha public key" msgstr "Llave pública de Recaptcha" @@ -483,7 +482,7 @@ msgstr "" #: conf/external_keys.py:95 msgid "Facebook secret key" -msgstr "" +msgstr "Llave privada de Facebook" #: conf/external_keys.py:103 msgid "Twitter consumer key" @@ -530,7 +529,7 @@ msgstr "" #: conf/flatpages.py:17 msgid "Text of the Q&A forum About page (html format)" -msgstr "" +msgstr "Texto para la página de descripción del foro (formato html)" #: conf/flatpages.py:20 msgid "" @@ -540,7 +539,7 @@ msgstr "" #: conf/flatpages.py:30 msgid "Text of the Q&A forum Privacy Policy (html format)" -msgstr "" +msgstr "Texto para la página de politicas de privacidad del foro (formato html)" #: conf/flatpages.py:33 msgid "" @@ -571,7 +570,7 @@ msgstr "Tamaño máximo de un comentario, debe ser menor a %(max_len)s" #: conf/forum_data_rules.py:60 msgid "Minimum length of search term for Ajax search" -msgstr "" +msgstr "Tamaño minimo para terminos de búsqueda Ajax " #: conf/forum_data_rules.py:61 msgid "Must match the corresponding database backend setting" @@ -630,7 +629,7 @@ msgstr "" #: conf/minimum_reputation.py:11 msgid "Minimum reputation required to perform actions" -msgstr "" +msgstr "Para realizar acciones es requerido una reputación mínima" #: conf/minimum_reputation.py:20 #, fuzzy @@ -702,7 +701,7 @@ msgstr "ver preguntas etiquetadas" #: conf/minimum_reputation.py:146 msgid "Lock posts" -msgstr "" +msgstr "Bloquear entradas" #: conf/reputation_changes.py:12 msgid "Reputation loss and gain rules" @@ -793,7 +792,7 @@ msgstr "Acerca de" #: conf/site_settings.py:59 msgid "Short name for your Q&A forum" -msgstr "" +msgstr "Nombre corto para tu foro" #: conf/site_settings.py:69 msgid "Base URL for your Q&A forum, must start with http or https" @@ -1509,7 +1508,7 @@ msgstr "" #: deps/django_authopenid/views.py:513 msgid "Account recovery email sent" -msgstr "" +msgstr "Se envio el correo para recuperación de cuenta" #: deps/django_authopenid/views.py:516 msgid "Please add one or more login methods." diff --git a/askbot/skins/default/media/images/logo.gif b/askbot/skins/default/media/images/logo.gif Binary files differindex 03eb79f4..bfbdd62d 100644 --- a/askbot/skins/default/media/images/logo.gif +++ b/askbot/skins/default/media/images/logo.gif diff --git a/askbot/skins/default/media/images/sprites.png b/askbot/skins/default/media/images/sprites.png Binary files differnew file mode 100644 index 00000000..46a8ff8e --- /dev/null +++ b/askbot/skins/default/media/images/sprites.png diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 1431135f..63e912f1 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -1,5 +1,7 @@ @import url(jquery.autocomplete.css); +/* ----- General HTML Styles----- */ + body { background: #FFF; font-size: 14px; @@ -7,7 +9,7 @@ body { margin: 0; padding: 0; color: #000; - font-family: sans-serif; + font-family: 'Yanone Kaffeesatz', sans-serif; } div { @@ -48,52 +50,6 @@ a { cursor: pointer; } -/* http://pathfindersoftware.com/2007/09/developers-note-2/ */ -* html .clearfix, -* html .paginator { - height: 1; - overflow: visible; -} -+ html .clearfix, -+ html .paginator { - min-height: 1%; -} -.clearfix:after, -.paginator:after { - clear: both; - content:"."; - display:block; - height: 0; - visibility: hidden; -} - -.badges a { - color: #763333; - text-decoration: underline; -} - -a:hover { - text-decoration: underline; -} - -.badge-context-toggle.active { - cursor: pointer; - text-decoration: underline; -} - -h1 { - font-size: 160%; - padding: 10px 0 5px 5px; -} - -.users-page h1, .tags-page h1 { - float: left; -} - -.main-page h1 { - margin-right: 5px; -} - h2 { font-size: 140%; padding: 3px 0 3px 5px; @@ -151,117 +107,154 @@ blockquote { background-color: #F5F5F5; } -.content-wrapper {/* wrapper positioning class */ - width: 960px; - margin: auto; - position:relative; +/* http://pathfindersoftware.com/2007/09/developers-note-2/ */ +* html .clearfix, +* html .paginator { + height: 1; + overflow: visible; } - -#ab-header { - margin-top: 0px; - background: #FFF; ++ html .clearfix, ++ html .paginator { + min-height: 1%; +} +.clearfix:after, +.paginator:after { + clear: both; + content:"."; + display:block; + height: 0; + visibility: hidden; } -#ab-header .content-wrapper { - height: 90px;/* same as logo height */ +.badges a { + color: #763333; + text-decoration: underline; } -#CALeft { - width: 710px; - float: left; - position: relative; - padding: 0 5px 10px 5px; +a:hover { + text-decoration: underline; } -#CARight { - width: 230px; - float: right; - padding: 0 5px 10px 5px; +.badge-context-toggle.active { + cursor: pointer; + text-decoration: underline; } -#CAFull { - float: left; - padding: 0 5px 10px 5px; - width: 950px; +h1 { + font-size: 160%; + padding: 10px 0 5px 5px; } -#ground { +/* ----- Custom positions ----- */ + +.left{float:left} +.right{float:right} +.clean{clear:both} + +/* ----- Color Palette ----- */ + +.darkred {color: darkred} +.greymessage {color:#424242} + +/* ----- Notify message bar ----- */ + +.notify { + position: fixed; + top: 0px; + left: 0px; width: 100%; - clear: both; - border-top: 1px solid #000; - padding: 6px 0 0 0; + z-index: 100; + padding: 0; text-align: center; - background: #777; + background-color: #f5dd69; + border-top:#fff 1px solid; } -#ground p { - margin-bottom:0; +.notify p { + margin-top: 6px; + margin-bottom: 6px; + font-size: 16px; } -#ab-logo { - padding: 0px 0px 0px 10px; +#close-notify { position: absolute; - bottom: 0; - left: 0; - height: 90px; - width: 70px; + right: 5px; + top: 7px; + color: #735005; + text-decoration: none; + line-height: 18px; + background: url(../images/sprites.png) -6px -5px; + cursor: pointer; + width:20px; + height:20px; } -img.license-logo { - margin: 6px 0 10px 0; +#close-notify:hover { + background: url(../images/sprites.png) -26px -5px; } -#ab-meta-nav, -#ab-main-nav { - position: absolute; - left: 100px; +/* ----- Header ----- */ + +#header { + margin-top: 0px; + background: #16160f; } -#ab-meta-nav { - top: 0px; +#logo img{ + padding: 5px 0px 5px 0px; +} + +#user-tools-nav { height: 20px; - padding: 3px; - margin: 0; + position:absolute; + bottom: 0; + right:10px; + padding-bottom:5px; } -#ab-meta-nav a { +#user-tools-nav a { height: 35px; text-align: right; margin-left: 20px; text-decoration: underline; - color: #555555; + color:#d0e296; + font-size:16px; } -#ab-meta-nav a:first-child { +#user-tools-nav a:first-child { margin-left: 0; } -#ab-meta-nav a#ab-responses { +#user-tools-nav a#ab-responses { margin-left: 3px; } -#ab-meta-nav a img { + + +#user-tools-nav .user-info, +#user-tools-nav .user-micro-info{ + color:#b5b593; +} + +#user-tools-nav a img { vertical-align:middle; margin-bottom:2px; } -#ab-meta-nav .user-info a { +#user-tools-nav .user-info a { margin: 0; text-decoration: none; } -#ab-main-nav { - bottom: 0; +#meta-nav { + float:right; } -#ab-main-nav a { - color: #333333; - background-color: #fff0e0; - border: 1px solid #888888; - border-bottom: none; - padding: 0px 12px 3px 12px; +#meta-nav a { + color: #e2e2ae; + padding: 0px 0px 0px 35px; height: 25px; line-height: 30px; - margin-right: 10px; + margin:5px 10px 0px 0px; font-size: 18px; font-weight: 100; text-decoration: none; @@ -269,34 +262,102 @@ img.license-logo { float: left; } -#ab-main-nav a:hover { +#meta-nav a:hover { text-decoration: underline; } -#ab-main-nav a.on { - height: 24px; - line-height: 28px; - border-bottom: 1px solid #a40000; - border-right: 1px solid #820000; - border-top: 1px solid #d40000; - border-left: 1px solid #d40000; /*background:#A31E39; */ - background: #b03a48; +#meta-nav a.on { + font-weight:bold; color: #FFF; - font-weight: 800; - text-decoration: none + text-decoration: none; } -#ab-main-nav a.special { +#meta-nav a.special { font-size: 18px; color: #B02B2C; font-weight: bold; text-decoration: none; } -#ab-main-nav a.special:hover { +#meta-nav a.special:hover { text-decoration: underline; } +#meta-nav #nav_tags{ + background: url(../images/sprites.png) -50px -5px no-repeat; +} + +#meta-nav #nav_users{ + background: url(../images/sprites.png) -125px -5px no-repeat; +} + +#meta-nav #nav_badges{ + background: url(../images/sprites.png) -210px -5px no-repeat; +} + +#secundary-header{ + height:55px; + background:#e9e9e1; + border-bottom:#d3d3c2 1px solid; + margin-bottom:10px; +} + +.users-page h1, .tags-page h1 { + float: left; +} + +.main-page h1 { + margin-right: 5px; +} + + + + +.content-wrapper {/* wrapper positioning class */ + width: 960px; + margin: auto; + position:relative; +} + +#CALeft { + width: 710px; + float: left; + position: relative; + padding: 0 5px 10px 5px; +} + +#CARight { + width: 230px; + float: right; + padding: 0 5px 10px 5px; +} + +#CAFull { + float: left; + padding: 0 5px 10px 5px; + width: 950px; +} + +#ground { + width: 100%; + clear: both; + border-top: 1px solid #000; + padding: 6px 0 0 0; + text-align: center; + background: #777; +} + +#ground p { + margin-bottom:0; +} + + + +img.license-logo { + margin: 6px 0 10px 0; +} + + #searchBar { display:inline-block; background-color: #cccccc;/*888a85; /*#e9b96e;*/ @@ -1839,9 +1900,7 @@ p.space-above { color: red; } -.darkred { - color: darkred; -} + button::-moz-focus-inner { padding:0; @@ -1882,42 +1941,6 @@ button::-moz-focus-inner { padding-right: 10px; } -.notify { - position: fixed; - top: 0px; - left: 0px; - width: 100%; - z-index: 100; - padding: 0; - text-align: center; - font-weight: Bold; - color: #444; - background-color: #F4A83D; -} - -.notify p { - margin-top: 5px; - margin-bottom: 5px; - font-size: 16px; -} - -#close-notify { - position: absolute; - right: 5px; - top: 5px; - padding: 0 3px 0 3px; - color: #735005; - text-decoration: none; - font-size: 14px; - line-height: 18px; - background-color: #FAD163; - border: 2px #735005 solid; - cursor: pointer; -} - -#close-notify:hover { - text-decoration: none; -} .noscript { position: fixed; diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 9f779945..9bcaf93f 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -22,6 +22,7 @@ type="text/css" /> {% endif %} + <link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'> {% block forestyle %}{% endblock %} {% if user_messages %} <style type="text/css"> @@ -46,7 +47,8 @@ <body class="{% block body_class %}{% endblock %}{% if page_class %} {{page_class}}{% endif %}"> {% include "blocks/system_messages.html" %} {% include "custom_header.html" ignore missing %} - {% include "blocks/header.html" %} + {% include "blocks/header.html" %} {# Logo, user tool navigation and meta navitation #} + {% include "blocks/secundary_header.html" %} {# Scope selector, search input and ask button #} <div class="content-wrapper"> {% block body %} {% endblock %} diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html index d7359007..d162078f 100644 --- a/askbot/skins/default/templates/blocks/header.html +++ b/askbot/skins/default/templates/blocks/header.html @@ -1,23 +1,26 @@ <!-- template header.html --> {% import "macros.html" as macros %} -<div id="ab-header"> +<div id="header"> <div class="content-wrapper"> {% if settings.SHOW_LOGO %} - <a id="ab-logo" href="{% url questions %}?start_over=true"><img + <a id="logo" href="{% url questions %}?start_over=true"><img src="{{ settings.SITE_LOGO_URL|media }}" title="{% trans %}back to home page{% endtrans %}" alt="{% trans site=settings.APP_SHORT_NAME %}{{site}} logo{% endtrans %}"/></a> {% endif %} - <div id="ab-meta-nav"> - {% include "blocks/header_meta_links.html" %} + <div id="user-tools-nav"> + {% include "blocks/user_navigation.html" %} {{settings.CUSTOM_HEADER}} </div> - <div id="ab-main-nav"> + + <div id="meta-nav"> + <!-- <a id="nav_questions" href="{% url questions %}" {% if active_tab == 'questions' %}class="on"{% endif %} >{% trans %}questions{% endtrans %}</a> + --> <a id="nav_tags" href="{% url tags %}" @@ -33,12 +36,15 @@ href="{% url badges %}" {% if active_tab == 'badges' %}class="on"{% endif %} >{% trans %}badges{% endtrans %}</a> + <!-- <a id="nav_ask" href="{% url ask %}" class="{% if active_tab == 'ask' %}on{% else %}special{% endif %}" >{% trans %}ask a question{% endtrans %}</a> + --> </div> + <div class="clean"></div> </div> </div> <!-- end template header.html --> diff --git a/askbot/skins/default/templates/blocks/secundary_header.html b/askbot/skins/default/templates/blocks/secundary_header.html new file mode 100644 index 00000000..a34f3c30 --- /dev/null +++ b/askbot/skins/default/templates/blocks/secundary_header.html @@ -0,0 +1,3 @@ +<!-- template secundary_header.html --> +<div id="secundary-header"> +</div> diff --git a/askbot/skins/default/templates/blocks/system_messages.html b/askbot/skins/default/templates/blocks/system_messages.html index 18ba03d7..120ad718 100644 --- a/askbot/skins/default/templates/blocks/system_messages.html +++ b/askbot/skins/default/templates/blocks/system_messages.html @@ -1,8 +1,8 @@ <div class="notify" style="display:none"> {% if user_messages %} {% for message in user_messages %} - <p class="darkred">{{ message }}</p> + <p class="greymessage">{{ message }}</p> {% endfor %} {% endif %} - <a id="close-notify" onclick="notify.close(true)">×</a> + <a id="close-notify" onclick="notify.close(true)"></a> </div> diff --git a/askbot/skins/default/templates/blocks/header_meta_links.html b/askbot/skins/default/templates/blocks/user_navigation.html index 83a5ed55..2324291d 100644 --- a/askbot/skins/default/templates/blocks/header_meta_links.html +++ b/askbot/skins/default/templates/blocks/user_navigation.html @@ -9,8 +9,7 @@ {% else %} <a href="{{ settings.LOGIN_URL }}">{% trans %}login{% endtrans %}</a> {% endif %} - <a href="{% url about %}">{% trans %}about{% endtrans %}</a> - <a href="{% url faq %}">{% trans %}faq{% endtrans %}</a> + {% if request.user.is_authenticated() and request.user.is_administrator() %} <a href="{% url site_settings %}">{% trans %}settings{% endtrans %}</a> {% endif %} |