Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

templates/500.html: rm setting platform name and replace and add inli… #75

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
9d2e819
settings/travis: add new key for deployment
fuzzylogic2000 Jan 8, 2021
4d253b2
readme: update batches
fuzzylogic2000 Jan 8, 2021
a375daa
config/travis: change settings
fuzzylogic2000 Jan 11, 2021
550a3fd
apps/userdashboard//config: adding userdashboard app with basic templ…
Jan 11, 2021
76b3bb4
assets/scss: adding some basic styling for user dashboard
Jan 11, 2021
0b38dac
templates/base_dashboard: cleanup indents
Jan 11, 2021
4367158
settings/travis: exchange key for deployment
fuzzylogic2000 Jan 11, 2021
b26cd5b
apps/users: only show public and semi-public projects in profile view
fuzzylogic2000 Jan 11, 2021
09fdafb
fix(deps): update dependency leaflet to v1.7.1
renovate-bot Jan 12, 2021
5eddfc2
travis.yml: Add secret for travis-ci.org
rmader Jan 12, 2021
84ab7b2
Revert "travis.yml: Add secret for travis-ci.org"
rmader Jan 12, 2021
4778336
apps/users/models//userdashboard/templates: only show moderation tab …
Jan 11, 2021
8f40244
apps/userdashboard/views: add LoginRequiredMixin
Jan 12, 2021
1186919
apps/userdashboard: style left side and add project tile
philli-m Jan 11, 2021
7df21f3
apps/userdashboard: add settings dropdown and profile and dashboard l…
philli-m Jan 13, 2021
b7dffb3
apps/*: add link on all usernames where content is added
philli-m Jan 14, 2021
7bd2df0
apps/userdashboard: add activities with limit to overview
philli-m Jan 18, 2021
d32bdfd
apps/userdashboard: add activities page view, url, template and link …
philli-m Jan 18, 2021
1f31af0
apps/userdashboard: add following page view, url, template and link f…
philli-m Jan 18, 2021
7bed9a8
apps/a4_candy_users/indicator: update capitalisation fixes #24
philli-m Jan 19, 2021
6ebeda3
apps/a4_candy_projects/project_tile_userprofile: add lock for private…
philli-m Jan 19, 2021
8f9bf07
apps/a4_candy_userdashboard: clean up some bits
philli-m Jan 19, 2021
b19aa84
apps/users/views: only show published projects on profile
Jan 15, 2021
32bf286
assets: add slick-carousel for project tiles in user profile
Jan 19, 2021
d22a328
apps/users: restyle user profile, remove tabs and add project carousel
Jan 19, 2021
1fdd45d
assets/carousels: scss linting fixes using ignore for slick overwrites
philli-m Jan 20, 2021
130c53c
tests/userdashboard: add tests for views
Jan 21, 2021
c62cb8a
tests/userdashboard: test view moderation rule
Jan 22, 2021
0e0292d
apps/userdashboard: mobile styling for userdashboard and child pages
philli-m Jan 21, 2021
c8b2de0
apps/userdashboard: add carousel to UD view and overview and update s…
philli-m Jan 21, 2021
5303aa0
apps/userdashboard: add carousel to UD and adjust styling and small s…
philli-m Jan 21, 2021
6652e60
base_userdashboard: correct typo fixes #35
philli-m Jan 25, 2021
23693c3
apps/user: add exclude_private_projects parameter to get_projects_fol…
Jan 25, 2021
6d2c956
fix(deps): update dependency acorn to v8.0.5
renovate-bot Jan 26, 2021
e2b8db3
fix(deps): update dependency postcss-loader to v4.2.0
renovate-bot Jan 26, 2021
306ba2c
user_detail/base_userdashboard: changing word break behavious fixes #39
philli-m Jan 25, 2021
640841c
assets/app.js: adapting width at which slides splits to 2
philli-m Jan 25, 2021
3743a85
userdashboard_overview: update wroding fixes #49
philli-m Jan 25, 2021
1888161
userdashboard_mobile_toggle: only see mod tab if moderator fixes #53
philli-m Jan 26, 2021
3b951ef
project_tile_userprofile: reduce padding for past status fixes #56
philli-m Jan 26, 2021
43e3f78
base_userdashboard: add wording for when no projects followed fixes #50
philli-m Jan 26, 2021
d808d1e
apps/userdashboard/views: add UserDashboardBaseMixin
Jan 26, 2021
7a798da
assets/images: adding all relevant images to logo folder and update f…
philli-m Jan 26, 2021
48d840d
cms/settings: adding platform name as setting in wagtail incl migration
philli-m Jan 26, 2021
003b065
templates: replacing platform name with setting in templates
philli-m Jan 26, 2021
de46ab9
templates/email: replaceing platform name with setting in emails
philli-m Jan 26, 2021
bde7dc2
settings/pyup: do not open update PRs
fuzzylogic2000 Feb 1, 2021
de2e8de
base_userdashboard; fix mobile dropdown to show orgs fixes #59
philli-m Jan 27, 2021
6f4e714
userdashboard/views: update tab behaviour for following and activitie…
philli-m Feb 1, 2021
287ae19
templates/account_dashboard//indicator: update name of user dashboard…
philli-m Feb 1, 2021
ec94cbb
cms/settings: add helptexts to platform settings
fuzzylogic2000 Feb 16, 2021
788b5f7
cms/settings: add icons to settings menu
fuzzylogic2000 Feb 16, 2021
49a0576
apps/userdashboard: add initial moderator components and project api
philli-m Jan 28, 2021
52e5b6c
templates/500.html: rm setting platform name and replace and add inli…
philli-m Mar 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pyup.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
Binary file removed adhocracy-plus/assets/images/email_logo.png
Binary file not shown.
Binary file removed adhocracy-plus/assets/images/favicon/favicon-16x16.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 0 additions & 16 deletions adhocracy-plus/assets/images/logo.svg

This file was deleted.

Binary file added adhocracy-plus/assets/images/logos/email_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions adhocracy-plus/assets/images/logos/logo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions adhocracy-plus/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
9 changes: 1 addition & 8 deletions adhocracy-plus/assets/scss/components/_dashboard_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
11 changes: 11 additions & 0 deletions adhocracy-plus/assets/scss/components/_dropdown.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
58 changes: 58 additions & 0 deletions adhocracy-plus/assets/scss/components/_project_tile_carousel.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
17 changes: 6 additions & 11 deletions adhocracy-plus/assets/scss/components/_status-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions adhocracy-plus/assets/scss/components/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
float: right;
}

.tablist--left {
text-align: left;
}

.tablist__left {
float: left;
}
Expand Down
23 changes: 13 additions & 10 deletions adhocracy-plus/assets/scss/components/_tile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ $svg-colour: #2a3cd4;
width: 100%;
}

.userdashboard__tile {
height: 320px;
}

.tile__head {
position: relative;

Expand Down Expand Up @@ -51,6 +55,10 @@ $svg-colour: #2a3cd4;
background-color: $brand-info;
}

.tile__image--sm {
min-height: 10rem;
}

.tile__image__copyright {
position: absolute;
bottom: 0;
Expand Down Expand Up @@ -108,7 +116,7 @@ $svg-colour: #2a3cd4;
}

.tile__title {
margin-top: 0;
margin: 0;
line-height: 1.3;

a {
Expand All @@ -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;
Expand All @@ -152,6 +151,10 @@ $svg-colour: #2a3cd4;
.tile__image--contained {
min-height: 13rem;
}

.tile__image--sm {
min-height: 8rem;
}
}

.blueprint__tile {
Expand Down