diff --git a/.pyup.yml b/.pyup.yml index 6ea20650a..04829bce3 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -1,4 +1,5 @@ -# autogenerated pyup.io config file +# autogenerated pyup.io config file # see https://pyup.io/docs/configuration/ for all available options +update: False schedule: every week diff --git a/.travis.yml b/.travis.yml index 6157a9985..844a3172e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,5 +36,5 @@ deploy: branch: master env: global: - - secure: loSDNJr/1BV5LdX2SDUvaNet3xbKNiW+PsazcSr38PylZQ/RLyDAcKzF8mxDW9LIiRpJTD0Dc8OwQlwWQWQhyUERM75gid/Sf5DxN8hfpwDNdpPvOsIrktZekir0CFhI1ezaHRWokZk3SmU8rzo6eG+uR6F1hKKP2zYDOWPKfrs/jHllbBB4p+P25IfxvdgX9t+t6aBACqUNzax9WIhmDyPPujWsDPyXOEfJcsgrGtmiCwZAAjSR+iMshWkQLh0kSmTQA/HwpuIx+T2zpWVEVu/rtxJ0FpWKQS7v2rah6wPJByNrkawGbjyhBKoKUj26Vz0Xr8SpNCu/EjAlxdQyy+GkRApGuW1+EXHwjRDjYWusfodbp/dEEnwXLugoSmRCDX8xhlc9llIGfMHKujz1dLKHoAKA6WgByVgFi0Ng0exlWZBJbX8QgbubdLXdqASj5NW3wpt7crTpz1gI7siVNPoNoa+VH+5hLMAtmX4RMDRyb5+4TnDbAf9iQYkHX+Z8D0Bxo81l4MycSuvBhK1uiO9t2dc+xZWI7rAkZdKllxDUCJAbM1kaUu9/Q7PJfQ2SJCE9DD7LaibV7iQPSmFrmrzXZax7R1QfYsb2Fd/ZzCeic/Kam87D/TdBqZ6MkZfjA/YZQD/NgEWvxo+vUm5zWUqlDAlcIpkPCREn4WjRRpc= + - secure: "H+psJBcxW9xht3NZFQV6zfpse7j/A3L3l1APIqesXoHShyJ0cpHIMppb2nfpo2GWGzjEHuuKqAjW9dK4q0DKRAukoDwax6kLKcdWDtth6+HAzYj5B9mMjrkzFOo2QkVFLzYXTi+bgBepvFnTdJd8w3xPEAqZhVkaxjAFQLNKI1bFNQl8sDx1y8Mze3LrGjcobNMITbLgaIxfSmLxgLkQJVEZZU8rl4pE2QYPfC/ACubYVP6zEHfBo7CvQufDOa9XcLoTpMH5NRyRk3qmcWUDTwFi+63dP2/cgOHFO0Wq+WFHcQzvu2cRGmdyIOkYKGMCHUId4R+bKmJPDbLahPK38uBq4aLJRBwZAU68WKYpQwYbdolZfCW87tQ0MabmD0GBUPlwdpFtvmDiChAVFSDSyNMB0FQMk7fMlDSTiNjdP5ScT1y2a2jdnBwbSR0Q1uZC1QHf7b0rCfqBEVmmqIP3sY3lZu1xoR6EwJPOC/UdR9MGDuzymn/bPEiWh0ayQCxOlZxmnI05RQZfOA5sFEUXnb1i8aIR/ntW1uEXxbIf/4TgszLeJUvAAP4O75DhZqYRCEyV6zth7duZTr/0NoAOfcHtCq67LD00DYAys6zokaeom7yRaO3dgwwIa6hVy+GnsKlk/c7N6398TWj9a4BSPgwimWY+TrdNU2Vi3qjHZaE=" - DJANGO_SETTINGS_MODULE='adhocracy-plus.config.settings.travis' diff --git a/README.md b/README.md index d01cf1ae8..8418731e1 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# adhocracy+ +# Kosmo -[adhocracy.plus](https://adhocracy.plus/) is a free Open-Source participation platform maintained and primarily developed by Liquid Democracy e.V.. It is based on [adhocracy 4](https://github.com/liqd/adhocracy4) and [Django](https://github.com/django/django). +Kosmo is forked from adhocracy.plus. [adhocracy.plus](https://adhocracy.plus/) is a free Open-Source participation platform maintained and primarily developed by Liquid Democracy e.V.. It is based on [adhocracy 4](https://github.com/liqd/adhocracy4) and [Django](https://github.com/django/django). -[![Build Status](https://travis-ci.org/liqd/adhocracy-plus.svg?branch=master)](https://travis-ci.org/liqd/adhocracy-plus) -[![Coverage Status](https://coveralls.io/repos/github/liqd/adhocracy-plus/badge.svg?branch=master)](https://coveralls.io/github/liqd/adhocracy-plus?branch=master) +[![Build Status](https://travis-ci.com/liqd/a4-kosmo.svg?branch=master)](https://travis-ci.com/github/liqd/a4-kosmo) +[![Coverage Status](https://coveralls.io/repos/github/liqd/a4-kosmo/badge.svg?branch=master)](https://coveralls.io/github/liqd/a4-kosmo?branch=master) ## Getting started @@ -19,7 +19,7 @@ adhocracy+ is designed to make online participation easy and accessible to every ### Installation: - git clone https://github.com/liqd/adhocracy-plus.git + git clone https://github.com/liqd/a4-kosmo.git cd adhocracy-plus make install make fixtures diff --git a/adhocracy-plus/assets/images/email_logo.png b/adhocracy-plus/assets/images/email_logo.png deleted file mode 100644 index e6887f3b9..000000000 Binary files a/adhocracy-plus/assets/images/email_logo.png and /dev/null differ diff --git a/adhocracy-plus/assets/images/favicon/favicon-16x16.png b/adhocracy-plus/assets/images/favicon/favicon-16x16.png deleted file mode 100644 index fc4cad9ec..000000000 Binary files a/adhocracy-plus/assets/images/favicon/favicon-16x16.png and /dev/null differ diff --git a/adhocracy-plus/assets/images/favicon/favicon-32x32.png b/adhocracy-plus/assets/images/favicon/favicon-32x32.png deleted file mode 100644 index 686e43d16..000000000 Binary files a/adhocracy-plus/assets/images/favicon/favicon-32x32.png and /dev/null differ diff --git a/adhocracy-plus/assets/images/favicon/favicon-96x96.png b/adhocracy-plus/assets/images/favicon/favicon-96x96.png deleted file mode 100644 index 7485ae428..000000000 Binary files a/adhocracy-plus/assets/images/favicon/favicon-96x96.png and /dev/null differ diff --git a/adhocracy-plus/assets/images/logo.svg b/adhocracy-plus/assets/images/logo.svg deleted file mode 100644 index ed700a985..000000000 --- a/adhocracy-plus/assets/images/logo.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - a+ logo wide - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/adhocracy-plus/assets/images/logos/email_logo.png b/adhocracy-plus/assets/images/logos/email_logo.png new file mode 100644 index 000000000..85db34915 Binary files /dev/null and b/adhocracy-plus/assets/images/logos/email_logo.png differ diff --git a/adhocracy-plus/assets/images/logos/favicon/favicon-16x16.png b/adhocracy-plus/assets/images/logos/favicon/favicon-16x16.png new file mode 100644 index 000000000..7e137fd40 Binary files /dev/null and b/adhocracy-plus/assets/images/logos/favicon/favicon-16x16.png differ diff --git a/adhocracy-plus/assets/images/logos/favicon/favicon-32x32.png b/adhocracy-plus/assets/images/logos/favicon/favicon-32x32.png new file mode 100644 index 000000000..6fddbc08c Binary files /dev/null and b/adhocracy-plus/assets/images/logos/favicon/favicon-32x32.png differ diff --git a/adhocracy-plus/assets/images/logos/favicon/favicon-96x96.png b/adhocracy-plus/assets/images/logos/favicon/favicon-96x96.png new file mode 100644 index 000000000..1b8c23479 Binary files /dev/null and b/adhocracy-plus/assets/images/logos/favicon/favicon-96x96.png differ diff --git a/adhocracy-plus/assets/images/logos/logo.svg b/adhocracy-plus/assets/images/logos/logo.svg new file mode 100644 index 000000000..70f06bc75 --- /dev/null +++ b/adhocracy-plus/assets/images/logos/logo.svg @@ -0,0 +1,10 @@ + + + + +Created with Sketch. + + diff --git a/adhocracy-plus/assets/js/app.js b/adhocracy-plus/assets/js/app.js index 11e94d6f2..89a847e5e 100644 --- a/adhocracy-plus/assets/js/app.js +++ b/adhocracy-plus/assets/js/app.js @@ -55,6 +55,34 @@ function init () { slidesToScroll: 1 }) + $('.project-tile-carousel').slick({ + initialSlide: 0, + focusOnSelect: false, + centerMode: false, + dots: false, + arrows: true, + centerPadding: 30, + mobileFirst: true, + infinite: false, + variableWidth: false, + slidesToShow: 1, + responsive: [ + { + breakpoint: 1024, + settings: { + slidesToShow: 3 + } + }, + { + breakpoint: 550, + settings: { + slidesToShow: 2 + } + } + ], + slidesToScroll: 1 + }) + if ($.fn.select2) { $('.js-select2').select2() } diff --git a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss index 36d70af29..74efc2cf2 100644 --- a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss +++ b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss @@ -30,14 +30,7 @@ } i.fa-chevron-up { - position: absolute; - top: $spacer; - right: 1.5*$spacer; - transition: transform 0.3s; - } - - &.collapsed i.fa-chevron-up { - transform: rotate(-180deg); + margin-top: $spacer; } } diff --git a/adhocracy-plus/assets/scss/components/_dropdown.scss b/adhocracy-plus/assets/scss/components/_dropdown.scss index c4c56506a..c7c3171a1 100644 --- a/adhocracy-plus/assets/scss/components/_dropdown.scss +++ b/adhocracy-plus/assets/scss/components/_dropdown.scss @@ -1,6 +1,17 @@ .dropdown { position: relative; text-align: left; + + i.fa-chevron-up { + position: absolute; + top: 0; + right: 1.5*$spacer; + transition: transform 0.3s; + } + + &.collapsed i.fa-chevron-up { + transform: rotate(-180deg); + } } .dropdown-item { diff --git a/adhocracy-plus/assets/scss/components/_project_tile_carousel.scss b/adhocracy-plus/assets/scss/components/_project_tile_carousel.scss new file mode 100644 index 000000000..ec1b3ec70 --- /dev/null +++ b/adhocracy-plus/assets/scss/components/_project_tile_carousel.scss @@ -0,0 +1,58 @@ +.project-tile-carousel { + position: relative; + margin: $spacer 0; + + //slick overwrites - nested for specificity + .slick-list { + margin: 0 -0.5*$spacer; + } + + .slick-slide { + margin: 0 0.5*$spacer; + } + + .slick-track { + padding-bottom: $padding; + } + + .slick-prev, + .slick-next { + top: 40%; + text-align: center; + width: 40px; + height: 40px; + border-radius: 100%; + border: 1px solid $border-color; + background-color: $body-bg; + z-index: 1; //for when tile links overlap - on mobile people swipe + + &:hover, + :focus { + background-color: $body-bg; + } + + &:before { + color: $gray-dark; + opacity: 1; + font-family: "Font Awesome 5 Free", sans-serif; + font-weight: 900; + font-size: $font-size-lg; + line-height: 1.3rem; + } + } + + .slick-prev:before { + content: '\f104'; // angle-left + } + + .slick-next:before { + content: '\f105'; // angle-right + } +} + +@media screen and (min-width: $breakpoint-md) { + .project-tile-carousel__wrapper { + margin-top: 4*$r-spacer; + margin-bottom: 3*$r-spacer; + } +} diff --git a/adhocracy-plus/assets/scss/components/_status-bar.scss b/adhocracy-plus/assets/scss/components/_status-bar.scss index e1a73ca8c..5abb869e7 100644 --- a/adhocracy-plus/assets/scss/components/_status-bar.scss +++ b/adhocracy-plus/assets/scss/components/_status-bar.scss @@ -6,14 +6,9 @@ text-align: left; } -.status-item__position-storefront.status-bar__past { - bottom: 0; - right: 0; - left: 0; -} - -.status-item_spacer { - height: 3*$r-spacer; +.status-item--baseline { + position: absolute; + bottom: 0.5*$spacer; } .status-bar__active { @@ -39,10 +34,10 @@ bottom: 0; right: 0; left: 0; -} -.status-bar__past--sm { - padding: 0.5*$padding; + &--sm { + padding: 0.25*$padding; + } } .status-bar__status { diff --git a/adhocracy-plus/assets/scss/components/_tabs.scss b/adhocracy-plus/assets/scss/components/_tabs.scss index 5ec650fd6..31011bdd5 100644 --- a/adhocracy-plus/assets/scss/components/_tabs.scss +++ b/adhocracy-plus/assets/scss/components/_tabs.scss @@ -46,6 +46,10 @@ float: right; } +.tablist--left { + text-align: left; +} + .tablist__left { float: left; } diff --git a/adhocracy-plus/assets/scss/components/_tile.scss b/adhocracy-plus/assets/scss/components/_tile.scss index 34a42bb2c..9c260f369 100644 --- a/adhocracy-plus/assets/scss/components/_tile.scss +++ b/adhocracy-plus/assets/scss/components/_tile.scss @@ -19,6 +19,10 @@ $svg-colour: #2a3cd4; width: 100%; } +.userdashboard__tile { + height: 320px; +} + .tile__head { position: relative; @@ -51,6 +55,10 @@ $svg-colour: #2a3cd4; background-color: $brand-info; } +.tile__image--sm { + min-height: 10rem; +} + .tile__image__copyright { position: absolute; bottom: 0; @@ -108,7 +116,7 @@ $svg-colour: #2a3cd4; } .tile__title { - margin-top: 0; + margin: 0; line-height: 1.3; a { @@ -117,15 +125,6 @@ $svg-colour: #2a3cd4; } } -.tile__title, -.tile__date { - margin: 0; -} - -.tile__date { - color: $text-color-gray; -} - @media (min-width: $breakpoint-xs) { .tile--vertical { margin: $r-spacer; @@ -152,6 +151,10 @@ $svg-colour: #2a3cd4; .tile__image--contained { min-height: 13rem; } + + .tile__image--sm { + min-height: 8rem; + } } .blueprint__tile { diff --git a/adhocracy-plus/assets/scss/components/_timeline-carousel.scss b/adhocracy-plus/assets/scss/components/_timeline-carousel.scss index cce0a7cbd..67bcb7364 100644 --- a/adhocracy-plus/assets/scss/components/_timeline-carousel.scss +++ b/adhocracy-plus/assets/scss/components/_timeline-carousel.scss @@ -1,153 +1,158 @@ -$timeline-carousel__top-space: 12px; +.timeline-carousel__wrapper { + $timeline-carousel__top-space: 12px; -.timeline-carousel__container { - max-width: 1140px; //same width as widest container -} - -.timeline-carousel__item { //to stop items displaying as a list before js is initialized - visibility: hidden; - - &.slick-initialized { - visibility: visible; + .timeline-carousel__container { + max-width: 1140px; //same width as widest container } -} -.timeline-carousel__dot { - display: inline-block; - background-color: $border-color; - padding: 0; - margin-bottom: 3px; - border-radius: 50%; - height: 12px; - width: 12px; - vertical-align: middle; - transition: transform 0.2s; - transform-origin: 50% 50%; -} + .timeline-carousel__item { //to stop items displaying as a list before js is initialized + visibility: hidden; -.timeline-carousel__label { - padding: $padding; - margin-top: 2*$spacer; - color: $text-color-gray; - border: 1px solid $text-color-gray; - background-color: $body-bg; - text-align: left; - transition: transform 0.2s; - transform-origin: 50% 50%; -} + &.slick-initialized { + visibility: visible; + } + } -.timeline-carousel__line { - position: absolute; - left: $spacer; - right: $spacer; - top: $timeline-carousel__top-space; - border-top: 1px dotted $border-color; -} + .timeline-carousel__dot { + display: inline-block; + background-color: $border-color; + padding: 0; + margin-bottom: 3px; + border-radius: 50%; + height: 12px; + width: 12px; + vertical-align: middle; + transition: transform 0.2s; + transform-origin: 50% 50%; + } -//slick overwrites -.slick-slide { - margin: 0 3*$spacer; - min-width: 275px; + .timeline-carousel__label { + padding: $padding; + margin-top: 2*$spacer; + color: $text-color-gray; + border: 1px solid $text-color-gray; + background-color: $body-bg; + text-align: left; + transition: transform 0.2s; + transform-origin: 50% 50%; + } - & a { - text-decoration: none; + .timeline-carousel__line { + position: absolute; + left: $spacer; + right: $spacer; + top: $timeline-carousel__top-space; + border-top: 1px dotted $border-color; } - :focus, - :hover { - outline: none; + //slick overwrites + .slick-slide { + margin: 0 3*$spacer; + min-width: 275px; - .timeline-carousel__dot { - transform: scale(1.85); + & a { + text-decoration: none; } - .timeline-carousel__label { - transform: scale(1.05); + :focus, + :hover { + outline: none; + /* stylelint-disable max-nesting-depth */ + .timeline-carousel__dot { + transform: scale(1.85); + } + + .timeline-carousel__label { + transform: scale(1.05); + } + /* stylelint-enable max-nesting-depth */ } } -} -.slick-track { - padding-bottom: $padding; -} - -.timeline-carousel { - position: relative; - color: $brand-primary; - text-align: center; - margin: $spacer 0; + .slick-track { + padding-bottom: $padding; + } - //slick overwrites - nested for specificity - .slick-prev, - .slick-next { - top: $timeline-carousel__top-space; + .timeline-carousel { + position: relative; + color: $brand-primary; text-align: center; - width: 25px; - height: 25px; - border-radius: 100%; - border: 1px solid $border-color; - background-color: $body-bg; + margin: $spacer 0; + + //slick overwrites - nested for specificity + .slick-prev, + .slick-next { + top: $timeline-carousel__top-space; + text-align: center; + width: 25px; + height: 25px; + border-radius: 100%; + border: 1px solid $border-color; + background-color: $body-bg; - @media screen and (min-width: $breakpoint) { - z-index: 1; //for when tile links overlap - on mobile people swipe + /* stylelint-disable max-nesting-depth */ + @media screen and (min-width: $breakpoint) { + z-index: 1; //for when tile links overlap - on mobile people swipe + } + + &:hover, + :focus { + background-color: $body-bg; + } + + &:before { + color: $brand-primary; + opacity: 1; + font-family: "Font Awesome 5 Free", sans-serif; + font-weight: 900; + font-size: $font-size-lg; + line-height: 1.3rem; + } + /* stylelint-enable max-nesting-depth */ } - &:hover, - :focus { - background-color: $body-bg; + .slick-prev:before { + content: '\f104'; // angle-left } - &:before { - color: $brand-primary; - opacity: 1; - font-family: "Font Awesome 5 Free", sans-serif; - font-weight: 900; - font-size: $font-size-lg; - line-height: 1.3rem; + .slick-next:before { + content: '\f105'; // angle-right } } - .slick-prev:before { - content: '\f104'; // angle-left - } - - .slick-next:before { - content: '\f105'; // angle-right - } -} - -//mobile slick overwrites -@media screen and (max-width: $breakpoint-xl-down) { - .slick-next { - right: 0 !important; - } + //mobile slick overwrites + @media screen and (max-width: $breakpoint-xl-down) { + .slick-next { + right: 0 !important; + } - .slick-prev { - left: 0 !important; + .slick-prev { + left: 0 !important; + } } -} -.initial { - background: $body-bg; - color: $text-color; - border: 2px solid $brand-primary; + .initial { + background: $body-bg; + color: $text-color; + border: 2px solid $brand-primary; - &.timeline-carousel__label { - padding: 1.5*$padding; + &.timeline-carousel__label { + padding: 1.5*$padding; + } - .timeline-carousel__title { + &.timeline-carousel__label > .timeline-carousel__title { font-weight: bold; } - } - &.timeline-carousel__dot { - transform: scale(1.85); + &.timeline-carousel__dot { + transform: scale(1.85); + } } -} -@media screen and (min-width: $breakpoint-md) { - .timeline-carousel__wrapper { - margin-top: 4*$r-spacer; - margin-bottom: 3*$r-spacer; + @media screen and (min-width: $breakpoint-md) { + .timeline-carousel__wrapper { + margin-top: 4*$r-spacer; + margin-bottom: 3*$r-spacer; + } } } diff --git a/adhocracy-plus/assets/scss/components/_userdashboard.scss b/adhocracy-plus/assets/scss/components/_userdashboard.scss new file mode 100644 index 000000000..90207b914 --- /dev/null +++ b/adhocracy-plus/assets/scss/components/_userdashboard.scss @@ -0,0 +1,20 @@ +.userdashboard-profile__side { + min-height: 100%; + display: block; //tabpanel se display to none?! +} + +.userdashboard-profile__user { + border: 1px solid #dadada; + text-align: center; + padding-bottom: 2*$padding; +} + +.userdashboard-profile__avatar { + border-radius: 50%; + shape-outside: circle(); + position: relative; +} + +.userdashboard-profile__main { + padding: 0 $padding; +} diff --git a/adhocracy-plus/assets/scss/icons/style.css b/adhocracy-plus/assets/scss/icons/style.css index 977a3b3f7..5a99f7ed2 100644 --- a/adhocracy-plus/assets/scss/icons/style.css +++ b/adhocracy-plus/assets/scss/icons/style.css @@ -71,3 +71,7 @@ .fa-eye { font-size: 1.05rem; } + +.font--lg { + font-size: 2rem !important; +} diff --git a/adhocracy-plus/assets/scss/style.scss b/adhocracy-plus/assets/scss/style.scss index 669bcef78..1ebffcb15 100644 --- a/adhocracy-plus/assets/scss/style.scss +++ b/adhocracy-plus/assets/scss/style.scss @@ -68,6 +68,7 @@ @import 'components/poll'; @import 'components/progress'; @import 'components/project_header'; +@import 'components/project_tile_carousel'; @import 'components/radio'; @import 'components/rating'; @import 'components/select_dropdown'; @@ -83,6 +84,7 @@ @import 'components/upload'; @import 'components/user_profile'; +@import 'components/userdashboard'; @import 'components/userindicator'; @import 'utility'; diff --git a/adhocracy-plus/config/settings/base.py b/adhocracy-plus/config/settings/base.py index 1273f9465..69e485faa 100644 --- a/adhocracy-plus/config/settings/base.py +++ b/adhocracy-plus/config/settings/base.py @@ -106,6 +106,7 @@ 'apps.exports', 'apps.offlineevents', 'apps.projects', + 'apps.userdashboard', # Apps defining phases 'apps.activities', @@ -244,7 +245,8 @@ 'idea_thumbnail': {'size': (240, 240), 'crop': 'smart'}, 'avatar': {'size': (200, 200), 'crop': 'smart'}, 'item_image': {'size': (330, 0), 'crop': 'scale'}, - 'map_thumbnail': {'size': (200, 200), 'crop': 'smart'} + 'map_thumbnail': {'size': (200, 200), 'crop': 'smart'}, + 'tiny_thumbnail': {'size': (50, 50), 'crop': 'smart'} } } diff --git a/adhocracy-plus/config/urls.py b/adhocracy-plus/config/urls.py index 35a40b6dd..9fa9d9118 100644 --- a/adhocracy-plus/config/urls.py +++ b/adhocracy-plus/config/urls.py @@ -33,12 +33,14 @@ from apps.polls.api import PollViewSet from apps.polls.api import VoteViewSet from apps.polls.routers import QuestionDefaultRouter +from apps.projects.api import ProjectViewSet from apps.users.decorators import user_is_project_admin router = routers.DefaultRouter() router.register(r'follows', FollowViewSet, basename='follows') router.register(r'reports', ReportViewSet, basename='reports') router.register(r'polls', PollViewSet, basename='polls') +router.register(r'projects', ProjectViewSet, basename='projects') module_router = a4routers.ModuleDefaultRouter() # FIXME: rename to 'chapters' @@ -72,6 +74,7 @@ re_path(r'^account/', include('apps.account.urls')), re_path(r'^embed/', include('apps.embed.urls')), re_path(r'^profile/', include('apps.users.urls')), + re_path(r'^userdashboard/', include('apps.userdashboard.urls')), re_path(r'^i18n/', include(i18n)), # API urls diff --git a/adhocracy-plus/templates/500.html b/adhocracy-plus/templates/500.html index d2d6ca101..c48d4e640 100644 --- a/adhocracy-plus/templates/500.html +++ b/adhocracy-plus/templates/500.html @@ -1,34 +1,57 @@ {% load i18n static %} - - Error — {% trans 'adhocracy+' %} - - + + 500 Error + + + - -
- Skip to content -
-
-
-
- adhocracy+ + +
+
+
+
+ + Kosmo + + + + + + +
-
-
-
-
-
-
+ +
+
+

500

-

{% trans 'Internal server error.' %}

- {% trans 'Back to adhocracy+' %} +

Internal server error.

+ Back to Kosmo
-
-
-
- -
- +
+
+
+ +
+ diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard.html b/adhocracy-plus/templates/a4dashboard/base_dashboard.html index dda581662..9b77c795c 100644 --- a/adhocracy-plus/templates/a4dashboard/base_dashboard.html +++ b/adhocracy-plus/templates/a4dashboard/base_dashboard.html @@ -5,48 +5,48 @@ {% block dashboard_nav %}
-
- {% if ORGANISATION.logo %} - {% url 'organisation' organisation_slug=ORGANISATION.slug as organisation_url %} - - - - {% else %} -
- - - -
- {% endif %} -
- {% if view.other_organisations_of_user %} - -
- {% for organisation in view.other_organisations_of_user %} - - {{ organisation.name }} - - {% endfor %} -
+
+ {% if ORGANISATION.logo %} + {% url 'organisation' organisation_slug=ORGANISATION.slug as organisation_url %} + + + {% else %} - {{ view.organisation.name }} +
+ + + +
{% endif %} +
+ {% if view.other_organisations_of_user %} + +
+ {% for organisation in view.other_organisations_of_user %} + + {{ organisation.name }} + + {% endfor %} +
+ {% else %} + {{ view.organisation.name }} + {% endif %} +
-
{% endblock %} diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html b/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html index 48dfc7006..47a664852 100644 --- a/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html +++ b/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html @@ -22,7 +22,7 @@