Permalink
Browse files

Merge branch 'master' into tk62

  • Loading branch information...
2 parents b25b51f + 2a06fd3 commit bdcbcb34ba19b381bc95046bc858ba76bd8d41c8 @gustavofonseca committed Mar 25, 2013
View
@@ -1,7 +1,9 @@
APP_PATH = opac
-MANAGE = $(APP_PATH)/manage.py
+MANAGE = manage.py
SETTINGS_TEST = opac.settings_tests
SETTINGS = opac.settings
+FIXTURES_DIR = $(APP_PATH)/fixtures
+
deps:
@pip install -r requirements.txt
@@ -11,13 +13,16 @@ clean:
@find . -name "*.pyc" -delete
test: clean
- @python $(MANAGE) test --settings=$(SETTINGS_TEST)
+ @cd $(APP_PATH) && python $(MANAGE) test --settings=$(SETTINGS_TEST)
dbsetup:
- @python $(MANAGE) syncdb --settings=$(SETTINGS)
+ @cd $(APP_PATH) && python $(MANAGE) syncdb --settings=$(SETTINGS)
+
+loaddata:
+ @cd $(APP_PATH) && python $(MANAGE) loaddata text_home_flatpage.json --settings=$(SETTINGS)
dbmigrate:
- @python $(MANAGE) migrate --settings=$(SETTINGS)
+ @cd $(APP_PATH) && python $(MANAGE) migrate --settings=$(SETTINGS)
compilemessages:
@cd $(APP_PATH) && python manage.py compilemessages --settings=$(SETTINGS)
@@ -303,7 +303,7 @@ def get_journal(cls, criteria=None):
journal = cls.objects.find_one(criteria)
if not journal:
- raise ValueError('no journal found for this citeria')
+ raise ValueError('no journal found for this criteria')
return cls(**journal)
@@ -26,27 +26,27 @@
<div class="row-fluid">
<hr/>
{% block footer %}
- <!-- CREATIVE COMMONS -->
<div style="text-align: right;">
<form name="form_language" id="form_language" action="/i18n/setlang/" method="post">
<input type="hidden" id="language" name="language">
{% csrf_token %}
<select id="lang_options">
- <option value="pt-br"
- {% if LANGUAGE_CODE == 'pt-br' %}selected{% endif %}>
- Português
+ <option value="pt"
+ {% if LANGUAGE_CODE == 'pt' %}selected{% endif %}>
+ {% trans 'Português' %}
</option>
- <option value="en"
+ <option value="en"
{% if LANGUAGE_CODE == 'en' %}selected{% endif %}>
- English
+ {% trans 'English' %}
</option>
- <option value="es"
+ <option value="es"
{% if LANGUAGE_CODE == 'es' %}selected{% endif %}>
- Español
+ {% trans 'Español' %}
</option>
</select>
</form>
</div>
+ <!-- CREATIVE COMMONS -->
<div class="span12" style="text-align: center;">
<img src="http://i.creativecommons.org/l/by-nc/3.0/80x15.png">
All the contents of www.scielo.br, except where otherwise noted, is licensed under a Creative Commons License
@@ -11,56 +11,56 @@
<dt>{% trans 'journal navigation' %}</dt>
<dd>
<div class="btn-group">
- <a href="/journal/{{ journal.acronym }}"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="{% url 'catalog.journal' journal.acronym %}"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'journal home' %}"><strong>{% trans 'home' %}</strong></a>
- <a href="/issues/{{ journal.acronym }}"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="{% url 'catalog.show_issues' journal.acronym %}"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'all issues from this journal' %}"><strong>{% trans 'all' %}</strong></a>
{% if navigation.previous_issue %}
- <a href="{{ navigation.previous_issue }}"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="{{ navigation.previous_issue }}"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'previous issue' %}"><strong>{% trans 'previous' %}</strong></a>
{% else %}
<div
- class="btn btn-small btn-primary tip-bottom disabled"
- rel="tooltip"
- data-placement="bottom"
+ class="btn btn-small btn-primary tip-bottom disabled"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'previous issue'%}"><strong>{% trans 'previous' %}</strong></div>
{% endif %}
- <a href="{{ navigation.current_issue }}"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="{{ navigation.current_issue }}"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'current issue' %}"><strong>{% trans 'current' %}</strong></a>
{% if navigation.next_issue %}
- <a href="{{ navigation.next_issue }}"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="{{ navigation.next_issue }}"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'next issue' %}"><strong>{% trans 'next' %}</strong></a>
{% else %}
- <div
- class="btn btn-small btn-primary tip-bottom disabled"
- data-placement="bottom"
+ <div
+ class="btn btn-small btn-primary tip-bottom disabled"
+ data-placement="bottom"
data-original-title="{% trans 'next issue' %}"><strong>{% trans 'next' %}</strong></div>
{% endif %}
{% if navigation.ahead %}
- <a href="{{ navigation.ahead }}"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="{{ navigation.ahead }}"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'ahead of print articles' %}"><strong>{% trans 'ahead' %}</strong></a>
{% endif %}
@@ -93,14 +93,14 @@
<dt>{% trans 'Collection' %}</dt>
<dd>
<div class="btn-group">
- <a href="/alpha"
- class="btn btn-small btn-primary tip-bottom"
- rel="tooltip"
- data-placement="bottom"
+ <a href="/alpha"
+ class="btn btn-small btn-primary tip-bottom"
+ rel="tooltip"
+ data-placement="bottom"
data-original-title="{% trans 'alphabetic collection journals list' %}">
<strong>{% trans 'alpha' %}</strong>
</a>
- <a href="/subject"
+ <a href="/subject"
class="btn btn-small btn-primary tip-bottom"
ref="tooltip"
data-placement="bottom"
@@ -1,4 +1,5 @@
{% extends "base_lv0.html" %}
+{% load flatpages %}
{% load i18n %}
{% block body %}
@@ -16,8 +17,8 @@
<div class="span4">
<h4>{% trans 'serial browsing' %}</h4>
<ul class="unstyled">
- <li><a href="alpha">{% trans 'alphabetic list' %}</a></li>
- <li><a href="subject">{% trans 'subject list'%}</a></li>
+ <li><a href="{% url 'catalog.list_journals' %}">{% trans 'alphabetic list' %}</a></li>
+ <li><a href="{% url 'catalog.list_journals_by_subject' %}">{% trans 'subject list'%}</a></li>
<li><a href="http://search.scielo.org" target="_blank">{% trans 'search form' %}</a></li>
</ul>
</div>
@@ -39,55 +40,7 @@
</div>
</div>
<div class="row-fluid">
- <dl>
- <dt>SciELO</dt>
- <dd>
- <p>
- The Scientific Electronic Library Online - SciELO is an electronic library covering a selected collection of Brazilian scientific journals.
- </p>
- <p>
- The library is an integral part of a project being developed by FAPESP - Fundação de Amparo à Pesquisa do Estado de São Paulo, in partnership with BIREME - the Latin American and Caribbean Center on Health Sciences Information. Since 2002, the Project is also supported by CNPq - Conselho Nacional de Desenvolvimento Científico e Tecnológico.
- </p>
- <p>
- The Project envisages the development of a common methodology for the preparation, storage, dissemination and evaluation of scientific literature in electronic format.
- </p>
- <p>
- As the project develops, new journal titles are being added in the library collection.
- </p>
- </dd>
- </dl>
- <dl>
- <dt><a name="about"></a>{% trans 'about this site' %}</dt>
- <dd>
- <p>
- This is the home page of SciELO Brasil Site.
- </p>
-
- <p>
- The objective of the site is to implement an electronic virtual library, providing full access to a collection of serial titles, a collection of issues from individual serial titles, as well as to the full text of articles. The access to both serial titles and articles is available via indexes and search forms.
- </p>
- <p>
- SciELO site is an integral part of the FAPESP/BIREME/CNPq Project and it is an application of the methodology being developed by the project, particularly the Internet Interface module.
- </p>
- <p>
- The site will be constantly updated both in form and content, according to the project's advancements.
- </p>
- </dd>
- </dl>
- <dl>
- <dt><a name="help"></a>{% trans 'help' %}</dt>
- <dd>
- <p>
- SciELO interface provides access to its serials collection via an alphabetic list of titles or a subject list or a search form by word of serial titles, publisher names, city of publication and subject.
- </p>
- <p>
- The interface also provides access to the full text of articles via author index or subject index, or by a search form on article elements such as author names, words from title, subject, words from the full text and publication year.
- </p>
- <p>
- Click an hypertext link at the top to call the corresponding access page.
- </p>
- </dd>
- </dl>
+ {{ flatpage.content }}
</div>
</div>
{% endblock %}
Oops, something went wrong.

0 comments on commit bdcbcb3

Please sign in to comment.