From: Library Admin Date: Thu, 22 Dec 2011 10:46:56 +0000 (+0100) Subject: Merge branch 'img-playground' of ssh://epsilon.fnp/home/rczajka/workspace/redakcja... X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/587871c59fb79c4c235ba6697174723f26af8aab?hp=210e62452e0e9f26f3e006c874b66ac44005d492 Merge branch 'img-playground' of ssh://epsilon.fnp/home/rczajka/workspace/redakcja into img-playground --- diff --git a/apps/catalogue/templates/catalogue/activity.html b/apps/catalogue/templates/catalogue/activity.html index 9c2eac51..125ae28e 100755 --- a/apps/catalogue/templates/catalogue/activity.html +++ b/apps/catalogue/templates/catalogue/activity.html @@ -4,6 +4,9 @@ {% load wall %} +{% block titleextra %}{% trans "Activity" %}{% endblock %} + + {% block content %}

< diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html index 65bbf336..78a8ee51 100644 --- a/apps/catalogue/templates/catalogue/base.html +++ b/apps/catalogue/templates/catalogue/base.html @@ -2,10 +2,11 @@ {% load catalogue %} - + {% compressed_css 'catalogue' %} - {% block title %}{% trans "Platforma Redakcyjna" %}{% endblock title %} + {% block title %}{% trans "Platforma Redakcyjna" %} :: + {% block titleextra %}{% endblock %}{% endblock title %} diff --git a/apps/catalogue/templates/catalogue/book_append_to.html b/apps/catalogue/templates/catalogue/book_append_to.html index 76a59621..c1ecc290 100755 --- a/apps/catalogue/templates/catalogue/book_append_to.html +++ b/apps/catalogue/templates/catalogue/book_append_to.html @@ -1,6 +1,8 @@ {% extends "catalogue/base.html" %} {% load i18n %} +{% block titleextra %}{% trans "Append book" %}{% endblock %} + {% block leftcolumn %}
{% csrf_token %} diff --git a/apps/catalogue/templates/catalogue/book_detail.html b/apps/catalogue/templates/catalogue/book_detail.html index bfd4ef5c..cbc6c32a 100755 --- a/apps/catalogue/templates/catalogue/book_detail.html +++ b/apps/catalogue/templates/catalogue/book_detail.html @@ -1,6 +1,10 @@ {% extends "catalogue/base.html" %} {% load book_list comments i18n %} + +{% block titleextra %}{{ book.title }}{% endblock %} + + {% block content %} diff --git a/apps/catalogue/templates/catalogue/book_edit.html b/apps/catalogue/templates/catalogue/book_edit.html index 3fffa963..43fe0ea9 100755 --- a/apps/catalogue/templates/catalogue/book_edit.html +++ b/apps/catalogue/templates/catalogue/book_edit.html @@ -1,6 +1,10 @@ {% extends "catalogue/base.html" %} {% load i18n %} + +{% block titleextra %}{% trans "Edit book" %}{% endblock %} + + {% block leftcolumn %} {% csrf_token %} diff --git a/apps/catalogue/templates/catalogue/chunk_add.html b/apps/catalogue/templates/catalogue/chunk_add.html index b287479c..f813b6f3 100755 --- a/apps/catalogue/templates/catalogue/chunk_add.html +++ b/apps/catalogue/templates/catalogue/chunk_add.html @@ -1,6 +1,10 @@ {% extends "catalogue/base.html" %} {% load i18n %} + +{% block titleextra %}{% trans "Split chunk" %}{% endblock %} + + {% block content %}

{% trans "Split chunk" %}

diff --git a/apps/catalogue/templates/catalogue/chunk_edit.html b/apps/catalogue/templates/catalogue/chunk_edit.html index bdacd028..cac192a2 100755 --- a/apps/catalogue/templates/catalogue/chunk_edit.html +++ b/apps/catalogue/templates/catalogue/chunk_edit.html @@ -2,6 +2,10 @@ {% load url from future %} {% load i18n %} + +{% block titleextra %}{% trans "Chunk settings" %}{% endblock %} + + {% block content %}

{% trans "Chunk settings" %}

diff --git a/apps/catalogue/templates/catalogue/document_create_missing.html b/apps/catalogue/templates/catalogue/document_create_missing.html index 47c99f98..aa2ce06c 100644 --- a/apps/catalogue/templates/catalogue/document_create_missing.html +++ b/apps/catalogue/templates/catalogue/document_create_missing.html @@ -1,6 +1,10 @@ {% extends "catalogue/base.html" %} {% load i18n %} + +{% block titleextra %}{% trans "Create a new book" %}{% endblock %} + + {% block content %}

{% trans "Create a new book" %}

diff --git a/apps/catalogue/templates/catalogue/document_list.html b/apps/catalogue/templates/catalogue/document_list.html index 920f25a6..2d608dcf 100644 --- a/apps/catalogue/templates/catalogue/document_list.html +++ b/apps/catalogue/templates/catalogue/document_list.html @@ -3,6 +3,8 @@ {% load i18n %} {% load catalogue book_list %} +{% block titleextra %}{% trans "Book list" %}{% endblock %} + {% block content %} {% book_list %} diff --git a/apps/catalogue/templates/catalogue/document_upload.html b/apps/catalogue/templates/catalogue/document_upload.html index a2e85138..0f8929cc 100644 --- a/apps/catalogue/templates/catalogue/document_upload.html +++ b/apps/catalogue/templates/catalogue/document_upload.html @@ -2,6 +2,9 @@ {% load i18n %} +{% block titleextra %}{% trans "Bulk document upload" %}{% endblock %} + + {% block leftcolumn %} diff --git a/apps/catalogue/templates/catalogue/image_detail.html b/apps/catalogue/templates/catalogue/image_detail.html index 8049b55c..cd77654f 100755 --- a/apps/catalogue/templates/catalogue/image_detail.html +++ b/apps/catalogue/templates/catalogue/image_detail.html @@ -1,6 +1,10 @@ {% extends "catalogue/base.html" %} {% load book_list comments i18n %} + +{% block titleextra %}{{ object.title }}{% endblock %} + + {% block content %} diff --git a/apps/catalogue/templates/catalogue/image_list.html b/apps/catalogue/templates/catalogue/image_list.html index 3ff75bc0..c6916e8d 100755 --- a/apps/catalogue/templates/catalogue/image_list.html +++ b/apps/catalogue/templates/catalogue/image_list.html @@ -4,6 +4,10 @@ {% load catalogue book_list %} +{% block titleextra %}{% trans "Image list" %}{% endblock %} + + + {% block content %} {% image_list %} {% endblock content %} diff --git a/apps/catalogue/templates/catalogue/my_page.html b/apps/catalogue/templates/catalogue/my_page.html index 48a21796..07b92422 100755 --- a/apps/catalogue/templates/catalogue/my_page.html +++ b/apps/catalogue/templates/catalogue/my_page.html @@ -4,6 +4,9 @@ {% load catalogue book_list wall %} +{% block titleextra %}{% trans "My page" %}{% endblock %} + + {% block leftcolumn %} {% book_list request.user %} {% endblock leftcolumn %} diff --git a/apps/catalogue/templates/catalogue/upload_pdf.html b/apps/catalogue/templates/catalogue/upload_pdf.html index a9670e47..265b84ad 100755 --- a/apps/catalogue/templates/catalogue/upload_pdf.html +++ b/apps/catalogue/templates/catalogue/upload_pdf.html @@ -2,6 +2,9 @@ {% load i18n %} +{% block titleextra %}{% trans "PDF file upload" %}{% endblock %} + + {% block content %} diff --git a/apps/catalogue/templates/catalogue/user_list.html b/apps/catalogue/templates/catalogue/user_list.html index 9e1e83e5..bc8af637 100755 --- a/apps/catalogue/templates/catalogue/user_list.html +++ b/apps/catalogue/templates/catalogue/user_list.html @@ -2,6 +2,10 @@ {% load i18n %} + +{% block titleextra %}{% trans "Users" %}{% endblock %} + + {% block leftcolumn %}

{% trans "Users" %}

diff --git a/apps/catalogue/templates/catalogue/user_page.html b/apps/catalogue/templates/catalogue/user_page.html index 89b4ecef..4be4ca3e 100755 --- a/apps/catalogue/templates/catalogue/user_page.html +++ b/apps/catalogue/templates/catalogue/user_page.html @@ -4,6 +4,9 @@ {% load catalogue book_list wall %} +{% block titleextra %}{{ viewed_user|nice_name }}{% endblock %} + + {% block leftcolumn %}

{{ viewed_user|nice_name }}

{% book_list viewed_user %} diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html index 9ef0c33e..5eda0942 100644 --- a/apps/wiki/templates/wiki/document_details_base.html +++ b/apps/wiki/templates/wiki/document_details_base.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load toolbar_tags i18n %} -{% block title %}{{ book.title }} - {{ block.super }}{% endblock %} +{% block titleextra %}{{ chunk.pretty_title }}{% endblock %} {% block extrahead %} {% load compressed %} {% compressed_css 'detail' %} diff --git a/apps/wiki/templates/wiki/tabs/annotations_view_item.html b/apps/wiki/templates/wiki/tabs/annotations_view_item.html index c6165fc7..7f17ce57 100644 --- a/apps/wiki/templates/wiki/tabs/annotations_view_item.html +++ b/apps/wiki/templates/wiki/tabs/annotations_view_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - [1] + [1]
    • diff --git a/apps/wiki/templates/wiki/tabs/gallery_view_item.html b/apps/wiki/templates/wiki/tabs/gallery_view_item.html index 20505d66..0ad3adda 100644 --- a/apps/wiki/templates/wiki/tabs/gallery_view_item.html +++ b/apps/wiki/templates/wiki/tabs/gallery_view_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - {% trans + {% trans
    • diff --git a/apps/wiki/templates/wiki/tabs/history_view_item.html b/apps/wiki/templates/wiki/tabs/history_view_item.html index bf39a333..e9375cde 100644 --- a/apps/wiki/templates/wiki/tabs/history_view_item.html +++ b/apps/wiki/templates/wiki/tabs/history_view_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - {% trans "History" %} + {% trans "History" %}
    • diff --git a/apps/wiki/templates/wiki/tabs/source_editor_item.html b/apps/wiki/templates/wiki/tabs/source_editor_item.html index 89e0fae7..22b6d660 100644 --- a/apps/wiki/templates/wiki/tabs/source_editor_item.html +++ b/apps/wiki/templates/wiki/tabs/source_editor_item.html @@ -2,5 +2,5 @@
  • - {% trans "Source code" %} + {% trans "Source code" %}
    • \ No newline at end of file diff --git a/apps/wiki/templates/wiki/tabs/summary_view_item.html b/apps/wiki/templates/wiki/tabs/summary_view_item.html index 856b3d70..ea7ae746 100644 --- a/apps/wiki/templates/wiki/tabs/summary_view_item.html +++ b/apps/wiki/templates/wiki/tabs/summary_view_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - {% trans "Summary" %} + {% trans "Summary" %}
    • diff --git a/apps/wiki/templates/wiki/tabs/wysiwyg_editor_item.html b/apps/wiki/templates/wiki/tabs/wysiwyg_editor_item.html index 718ec491..ec853cd7 100644 --- a/apps/wiki/templates/wiki/tabs/wysiwyg_editor_item.html +++ b/apps/wiki/templates/wiki/tabs/wysiwyg_editor_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - {% trans "Visual editor" %} + {% trans "Visual editor" %}
    • diff --git a/apps/wiki_img/templates/wiki_img/base.html b/apps/wiki_img/templates/wiki_img/base.html deleted file mode 100644 index e512e8db..00000000 --- a/apps/wiki_img/templates/wiki_img/base.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "base.html" %} -{% load compressed i18n %} - -{% block title %}{{ document_name }} - {{ block.super }}{% endblock %} - -{% block extrahead %} -{% compressed_css 'listing' %} -{% endblock %} - -{% block extrabody %} -{% compressed_js 'listing' %} -{% endblock %} - -{% block maincontent %} -

    Home{% trans "Platforma Redakcyjna" %}

    -
    - {% block leftcolumn %} - {% endblock leftcolumn %} -
    -
    - {% block rightcolumn %} - {% endblock rightcolumn %} -
    -{% endblock maincontent %} \ No newline at end of file diff --git a/apps/wiki_img/templates/wiki_img/document_details_base.html b/apps/wiki_img/templates/wiki_img/document_details_base.html index 93c267c2..d329c040 100644 --- a/apps/wiki_img/templates/wiki_img/document_details_base.html +++ b/apps/wiki_img/templates/wiki_img/document_details_base.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load toolbar_tags i18n %} -{% block title %}{{ document.name }} - {{ block.super }}{% endblock %} +{% block title %}{{ document.title }} - {{ block.super }}{% endblock %} {% block extrahead %} {% load compressed %} {% compressed_css 'detail' %} diff --git a/apps/wiki_img/templates/wiki_img/tabs/motifs_editor_item.html b/apps/wiki_img/templates/wiki_img/tabs/motifs_editor_item.html index 33ad25b5..a5a3c347 100644 --- a/apps/wiki_img/templates/wiki_img/tabs/motifs_editor_item.html +++ b/apps/wiki_img/templates/wiki_img/tabs/motifs_editor_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - {% trans "Motifs" %} + {% trans "Motifs" %}
    • diff --git a/apps/wiki_img/templates/wiki_img/tabs/objects_editor_item.html b/apps/wiki_img/templates/wiki_img/tabs/objects_editor_item.html index d5b0832f..9fc3af90 100644 --- a/apps/wiki_img/templates/wiki_img/tabs/objects_editor_item.html +++ b/apps/wiki_img/templates/wiki_img/tabs/objects_editor_item.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - {% trans "Objects" %} + {% trans "Objects" %}
    • diff --git a/apps/wiki_img/templates/wiki_img/tabs/source_editor_item.html b/apps/wiki_img/templates/wiki_img/tabs/source_editor_item.html index 89e0fae7..22b6d660 100644 --- a/apps/wiki_img/templates/wiki_img/tabs/source_editor_item.html +++ b/apps/wiki_img/templates/wiki_img/tabs/source_editor_item.html @@ -2,5 +2,5 @@
  • - {% trans "Source code" %} + {% trans "Source code" %}
    • \ No newline at end of file diff --git a/apps/wiki_img/templates/wiki_img/tabs/summary_view_item.html b/apps/wiki_img/templates/wiki_img/tabs/summary_view_item.html index 2b4daeb3..bae3ea5d 100644 --- a/apps/wiki_img/templates/wiki_img/tabs/summary_view_item.html +++ b/apps/wiki_img/templates/wiki_img/tabs/summary_view_item.html @@ -1,5 +1,5 @@ {% load i18n %} {% load wiki %}
  • - {% trans "Summary" %} + {% trans "Summary" %}
    • diff --git a/redakcja/static/css/filelist.css b/redakcja/static/css/filelist.css index c347679c..4cf22f98 100644 --- a/redakcja/static/css/filelist.css +++ b/redakcja/static/css/filelist.css @@ -115,7 +115,7 @@ td { } a, a:visited, a:active { - color: #bf6000; + color: #a05000; text-decoration: none; } diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css index c1060bcd..09a6069e 100644 --- a/redakcja/static/css/master.css +++ b/redakcja/static/css/master.css @@ -189,6 +189,10 @@ body { float: left; } +.tabs a { + color: black; +} + #tabs-right { float: right; padding-right: 1em; diff --git a/redakcja/static/js/wiki/loader.js b/redakcja/static/js/wiki/loader.js index f2d7fb71..da951722 100644 --- a/redakcja/static/js/wiki/loader.js +++ b/redakcja/static/js/wiki/loader.js @@ -33,6 +33,7 @@ $(function() * TABS */ $('.tabs li').live('click', function(event, callback) { + event.preventDefault(); $.wiki.switchToTab(this); }); diff --git a/redakcja/static/js/wiki/loader_readonly.js b/redakcja/static/js/wiki/loader_readonly.js index c22e9d7a..a859ec69 100644 --- a/redakcja/static/js/wiki/loader_readonly.js +++ b/redakcja/static/js/wiki/loader_readonly.js @@ -24,6 +24,7 @@ $(function() * TABS */ $('#tabs li').live('click', function(event, callback) { + event.preventDefault(); $.wiki.switchToTab(this); }); diff --git a/redakcja/static/js/wiki/view_editor_source.js b/redakcja/static/js/wiki/view_editor_source.js index 8fb93589..547456f0 100644 --- a/redakcja/static/js/wiki/view_editor_source.js +++ b/redakcja/static/js/wiki/view_editor_source.js @@ -19,7 +19,7 @@ lineNumbers: true, width: "100%", height: "100%", - tabMode: 'spaces', + tabMode: 'default', indentUnit: 0, readOnly: CurrentDocument.readonly || false, initCallback: function(){ diff --git a/redakcja/static/js/wiki_img/loader.js b/redakcja/static/js/wiki_img/loader.js index 9cfc640d..c3fe03e0 100644 --- a/redakcja/static/js/wiki_img/loader.js +++ b/redakcja/static/js/wiki_img/loader.js @@ -33,6 +33,7 @@ $(function() * TABS */ $('.tabs li').live('click', function(event, callback) { + event.preventDefault(); $.wiki.switchToTab(this); }); diff --git a/redakcja/static/js/wiki_img/loader_readonly.js b/redakcja/static/js/wiki_img/loader_readonly.js index b2f574d8..99e5ad0e 100755 --- a/redakcja/static/js/wiki_img/loader_readonly.js +++ b/redakcja/static/js/wiki_img/loader_readonly.js @@ -25,6 +25,7 @@ $(function() * TABS */ $('#tabs li').live('click', function(event, callback) { + event.preventDefault(); $.wiki.switchToTab(this); }); diff --git a/redakcja/templates/base.html b/redakcja/templates/base.html index 4f40b297..595007db 100644 --- a/redakcja/templates/base.html +++ b/redakcja/templates/base.html @@ -1,9 +1,10 @@ {% load i18n %} - + - {% block title %}{% trans "Platforma Redakcyjna" %}{% block subtitle %}{% endblock subtitle %}{% endblock title%} + {% block title %}{% trans "Platforma Redakcyjna" %} :: + {% block titleextra %}{% endblock titleextra %}{% endblock title%} {% block extrahead %} {% endblock %}