diff --git a/VERSION b/VERSION index ddf1d4ae..223df198 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.10 +0.10.11 diff --git a/core/static/README b/core/static/README deleted file mode 100755 index 8836fac6..00000000 --- a/core/static/README +++ /dev/null @@ -1 +0,0 @@ -Here be all the static files! diff --git a/core/static/SIL Open Font License 1.1.txt b/core/static/SIL Open Font License 1.1.txt deleted file mode 100755 index e4b0c4ff..00000000 --- a/core/static/SIL Open Font License 1.1.txt +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/core/static/css/_constants.scss b/core/static/css/_constants.scss index d8b89c73..0c92401f 100644 --- a/core/static/css/_constants.scss +++ b/core/static/css/_constants.scss @@ -41,3 +41,5 @@ $secondary-family: $font-text; $color-btn-light: #eee; $color-btn-primary: lighten($piratepurple, 10%); + +$sidebar-width: 290px; diff --git a/core/static/css/_navbar.scss b/core/static/css/_navbar.scss index 3babaae0..18c758e0 100644 --- a/core/static/css/_navbar.scss +++ b/core/static/css/_navbar.scss @@ -11,6 +11,7 @@ .navbar-brand { margin: 0px; padding: 0px; color: #fff; } .navbar-brand img { max-height: 70px; } .nav > .li, .navbar .nav > li > a:hover, .navbar-nav li > a { + background: transparent; color: #fff; font-family: $font-heading; font-size: 18px; diff --git a/core/static/css/_sidebar.scss b/core/static/css/_sidebar.scss index 551b012f..a3d0774a 100644 --- a/core/static/css/_sidebar.scss +++ b/core/static/css/_sidebar.scss @@ -6,17 +6,13 @@ transition: all 0.5s ease; } -#wrapper.toggled { - padding-left: 0px; -} - #sidebar-wrapper { z-index: 1000; position: fixed; - left: 250px; + left: $sidebar-width; width: 0; height: 100%; - margin-left: -250px; + margin-left: -$sidebar-width; overflow-y: auto; background: $background-lightgray; -webkit-transition: all 0.5s ease; @@ -26,32 +22,34 @@ } #wrapper.toggled #sidebar-wrapper { - width: 250px; -} - -#page-content-wrapper { - width: 100%; - position: absolute; - padding: 15px; -} - -#wrapper.toggled #page-content-wrapper { - position: absolute; - margin-right: -250px; + width: $sidebar-width; } - .sidebar-nav { position: absolute; top: 0; - width: 250px; + width: $sidebar-width; margin: 0; padding: 0; list-style: none; } +.sidebar-nav .dropdown-menu { + width: $sidebar-width; +} + +.sidebar-nav .dropdown-menu li { + text-indent: 0px; + border-bottom: 1px solid $background-lightgray; +} + +.sidebar-nav .dropdown-menu li > a { + white-space: normal; + padding-left: 10px; +} + .sidebar-nav li { - text-indent: 20px; + text-indent: 10px; line-height: 40px; } @@ -68,30 +66,15 @@ } .sidebar-nav li a:hover, .sidebar-nav li.active a { - text-decoration: none; - color: #000; background: #ddd; } .sidebar-nav li a:active, .sidebar-nav li a:focus { - text-decoration: none; - color: #000; background: #ddd; } -.sidebar-nav>.sidebar-brand { - height: 65px; - font-size: 18px; - line-height: 60px; -} - -.sidebar-nav>.sidebar-brand a { - color: #999999; -} - -.sidebar-nav>.sidebar-brand a:hover { - color: #fff; - background: none; +.sidebar-nav li > span.label { + margin-left: 10px; } .navbar-toggle { @@ -108,23 +91,15 @@ @media(min-width:768px) { #wrapper { - padding-left: 250px; + padding-left: $sidebar-width; } #wrapper.toggled { - padding-left: 250px; + padding-left: $sidebar-width; } #sidebar-wrapper { - width: 250px; + width: $sidebar-width; } #wrapper.toggled #sidebar-wrapper { - width: 250px; - } - #page-content-wrapper { - padding: 20px; - position: relative; - } - #wrapper.toggled #page-content-wrapper { - position: relative; - margin-right: 0; + width: $sidebar-width; } } diff --git a/core/static/css/application.css b/core/static/css/application.css index d9e52845..0e884a15 100644 --- a/core/static/css/application.css +++ b/core/static/css/application.css @@ -17,7 +17,6 @@ section.content { padding-bottom: 30px; } footer { - margin-left: -250px; z-index: 2000; position: fixed; bottom: 0px; @@ -31,9 +30,6 @@ footer { color: #fff; } footer a { color: #fff; } - @media (max-width: 768px) { - footer { - margin-left: 0px; } } .navbar { background-color: #503087; @@ -49,6 +45,7 @@ footer { .navbar .navbar-brand img { max-height: 70px; } .navbar .nav > .li, .navbar .navbar .nav > li > a:hover, .navbar .navbar-nav li > a { + background: transparent; color: #fff; font-family: "Montserrat"; font-size: 18px; @@ -174,16 +171,13 @@ div.prosemirror-editor { -o-transition: all 0.5s ease; transition: all 0.5s ease; } -#wrapper.toggled { - padding-left: 0px; } - #sidebar-wrapper { z-index: 1000; position: fixed; - left: 250px; + left: 290px; width: 0; height: 100%; - margin-left: -250px; + margin-left: -290px; overflow-y: auto; background: #eee; -webkit-transition: all 0.5s ease; @@ -192,27 +186,29 @@ div.prosemirror-editor { transition: all 0.5s ease; } #wrapper.toggled #sidebar-wrapper { - width: 250px; } - -#page-content-wrapper { - width: 100%; - position: absolute; - padding: 15px; } - -#wrapper.toggled #page-content-wrapper { - position: absolute; - margin-right: -250px; } + width: 290px; } .sidebar-nav { position: absolute; top: 0; - width: 250px; + width: 290px; margin: 0; padding: 0; list-style: none; } +.sidebar-nav .dropdown-menu { + width: 290px; } + +.sidebar-nav .dropdown-menu li { + text-indent: 0px; + border-bottom: 1px solid #eee; } + +.sidebar-nav .dropdown-menu li > a { + white-space: normal; + padding-left: 10px; } + .sidebar-nav li { - text-indent: 20px; + text-indent: 10px; line-height: 40px; } .sidebar-nav li a { @@ -226,26 +222,13 @@ div.prosemirror-editor { margin-right: 7px; } .sidebar-nav li a:hover, .sidebar-nav li.active a { - text-decoration: none; - color: #000; background: #ddd; } .sidebar-nav li a:active, .sidebar-nav li a:focus { - text-decoration: none; - color: #000; background: #ddd; } -.sidebar-nav > .sidebar-brand { - height: 65px; - font-size: 18px; - line-height: 60px; } - -.sidebar-nav > .sidebar-brand a { - color: #999999; } - -.sidebar-nav > .sidebar-brand a:hover { - color: #fff; - background: none; } +.sidebar-nav li > span.label { + margin-left: 10px; } .navbar-toggle { float: left; @@ -257,24 +240,16 @@ div.prosemirror-editor { box-shadow: 1px 0px 4px #ccc; } } @media (min-width: 768px) { #wrapper { - padding-left: 250px; } + padding-left: 290px; } #wrapper.toggled { - padding-left: 250px; } + padding-left: 290px; } #sidebar-wrapper { - width: 250px; } + width: 290px; } #wrapper.toggled #sidebar-wrapper { - width: 250px; } - - #page-content-wrapper { - padding: 20px; - position: relative; } - - #wrapper.toggled #page-content-wrapper { - position: relative; - margin-right: 0; } } + width: 290px; } } .list-item:first-of-type { margin-top: 25px; border-top: 1px solid #62388d; } diff --git a/core/static/css/application.css.map b/core/static/css/application.css.map index 42720e2e..9c8bf4d3 100644 --- a/core/static/css/application.css.map +++ b/core/static/css/application.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["_media-mixins.scss","_fonts.scss","application.scss","_constants.scss","_navbar.scss","_widgets.scss","_prosemirror.scss","_sidebar.scss","_lists.scss","_task.scss","_task-list.scss","_task-applications.scss","_task-single.scss","_profile.scss"], "names": [], "file": "application.css" diff --git a/core/static/css/application.scss b/core/static/css/application.scss index 7b6002ea..ca443e79 100644 --- a/core/static/css/application.scss +++ b/core/static/css/application.scss @@ -19,7 +19,6 @@ section.content { } footer { - margin-left: -250px; z-index: 2000; position: fixed; bottom: 0px; @@ -34,9 +33,6 @@ footer { a { color: $font-color-light; } - @media (max-width: 768px) { - margin-left: 0px; - } } @import "_navbar.scss"; diff --git a/core/static/demo.html b/core/static/demo.html deleted file mode 100755 index d60201b3..00000000 --- a/core/static/demo.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - Font Face Demo - - - - - -
-

Font-face Demo for the League Gothic Font

- - - -

League Gothic Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- -
- - diff --git a/core/static/js/wasa2il.js b/core/static/js/wasa2il.js index 25bf9a66..f11d4c68 100755 --- a/core/static/js/wasa2il.js +++ b/core/static/js/wasa2il.js @@ -16,44 +16,6 @@ function user_logged_out() { } -function document_propose(doc, val) { - data = {}; - if (issue_id != undefined) { - data["issue"] = issue_id; - } - $.getJSON("/api/document/propose/" + doc + "/" + val + "/", data, function(data) { - if (data.ok) { - $('#document_import').modal('hide'); - if (data.html_user_documents != undefined) { - $("#document_user_proposals_table").html(data.html_user_documents); - } - if (data.html_all_documents != undefined) { - $("#document_all_proposals_table").html(data.html_all_documents); - } - } - }); -} - - -function document_import(doc) { - data = {}; - if (issue_id != undefined) { - data["issue"] = issue_id; - } - data["document"] = doc; - - $.getJSON("/api/issue/import/", data, function(data) { - if (data.ok) { - if (data.html_user_documents != undefined) { - $("#document_user_proposals_table").html(data.html_user_documents); - } - if (data.html_all_documents != undefined) { - $("#document_all_proposals_table").html(data.html_all_documents); - } - } - }); -} - function topic_star(topic) { $.getJSON("/api/topic/star/", {"topic": topic}, function(data) { if (data.ok) { diff --git a/core/static/stylesheet.css b/core/static/stylesheet.css deleted file mode 100755 index 6fe5f96f..00000000 --- a/core/static/stylesheet.css +++ /dev/null @@ -1,16 +0,0 @@ -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 29, 2013 02:01:30 PM America/New_York */ - - - -@font-face { - font-family: 'LeagueGothicRegular'; - src: url('League_Gothic-webfont.eot'); - src: url('League_Gothic-webfont.eot?#iefix') format('embedded-opentype'), - url('League_Gothic-webfont.woff') format('woff'), - url('League_Gothic-webfont.ttf') format('truetype'), - url('League_Gothic-webfont.svg#LeagueGothicRegular') format('svg'); - font-weight: normal; - font-style: normal; - -} - diff --git a/core/views.py b/core/views.py index c278587b..01eaa967 100644 --- a/core/views.py +++ b/core/views.py @@ -136,46 +136,6 @@ def profile(request, username=None): return render(request, 'profile/profile.html', ctx) -@never_cache -def user_proposals(request, username=None): - ctx = {} - - # Determine if we're looking up the currently logged in user or someone else. - if username: - profile_user = get_object_or_404(User, username=username) - elif request.user.is_authenticated(): - profile_user = request.user - else: - return HttpResponseRedirect(settings.LOGIN_URL) - - polities = profile_user.polities.all() - profile = UserProfile.objects.get(user_id=profile_user.id) - - # # Get documents and documentcontents which user has made - # documentdata = [] - # contents = profile_user.documentcontent_set.select_related('document').order_by('document__name', 'order') - # last_doc_id = 0 - # for c in contents: - # if c.document_id != last_doc_id: - # documentdata.append(c.document) # Template will detect the type as Document and show as heading - # last_doc_id = c.document_id - # - # documentdata.append(c) - - # Get running elections in which the user is currently a candidate - now = datetime.now() - current_elections = Election.objects.filter(candidate__user=profile_user, deadline_votes__gte=now) - - ctx = { - 'polities': polities, - # 'documentdata': documentdata, - 'profile_user': profile_user, - 'profile': profile, - } - return render(request, 'profile/proposals.html', ctx) - - - @login_required def view_settings(request): diff --git a/polity/contextprocessors.py b/polity/contextprocessors.py index dd6eca97..415b6c89 100644 --- a/polity/contextprocessors.py +++ b/polity/contextprocessors.py @@ -30,8 +30,15 @@ def add_to_menulist(polity_menulist, polity, depth): add_to_menulist(polity_menulist, subpolity, depth + 1) # Add "root" polities with a depth of 0. - for polity in Polity.objects.filter(parent_id=None): - add_to_menulist(polity_menulist, polity, 0) + root_polities = Polity.objects.filter(parent_id=None) + if len(root_polities) == 1: + # If there is only one root polity, we'll only want to add its + # children, and not the root polity itself. + for subpolity in parent_children_map[root_polities[0].id]: + add_to_menulist(polity_menulist, subpolity, 0) + else: + for root_polity in root_polities: + add_to_menulist(polity_menulist, root_polity, 0) ctx = { 'polity_menulist': polity_menulist, diff --git a/wasa2il/templates/_sidenav_polity.html b/wasa2il/templates/_sidenav_polity.html index fe967fbf..f02c0dfa 100644 --- a/wasa2il/templates/_sidenav_polity.html +++ b/wasa2il/templates/_sidenav_polity.html @@ -9,7 +9,7 @@ {{polity.name}} {% else %} -
  • +
  • {{polity.name}} diff --git a/wasa2il/templates/base.html b/wasa2il/templates/base.html index 84feaa15..0051302d 100644 --- a/wasa2il/templates/base.html +++ b/wasa2il/templates/base.html @@ -94,7 +94,6 @@ -
    -
    + + + {% block extrascripts %} {% endblock %}