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.

Sign up for GitHub

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

Jump to bottom

Added Activity tab into the dropdown #1507

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Added Activity tab into the dropdown #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24a345b
improvements on the landing page and login page
Sudiptobhukta Aug 8, 2023
ca99e57
login page changes
Sudiptobhukta Aug 8, 2023
21c561c
improvement on the my profile page and added the my activity tab in t…
Sudiptobhukta Aug 8, 2023
6cef5a3
Remove unexpected newlines at the end of the file
Sudiptobhukta Aug 9, 2023
fde15f2
removed Expected a newline at the end of the file.
Sudiptobhukta Aug 9, 2023
98c919c
removing the issue by codeclimate
Sudiptobhukta Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions project/accounts/templates/accounts/account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div id="sidebar-template">
<div class="profile-image">
<div class="big-image-cropper z-depth-1">
<img class="responsive-img" src={{ profile.profile_image_url }} />
<img class="responsive-img" src="{{ profile.profile_image_url }}" />
</div>
</div>
<!-- Prevent users from following themselves. -->
Expand All @@ -31,10 +31,12 @@
{% endif %}
{% endif %}
<div class="user-info section">
<div class="full-name">
<div class="full-name center">
{{ profile.first_name }} {{ profile.last_name }}
</div>
<div class="username">@{{ username }}</div>
<div class="username center ">@{{ profile.user.username }}</div>
</div>
<div class="email center ">@{{ profile.user.email }}</div>
</div>
<div class="categories">
<ul>
Expand All @@ -48,9 +50,9 @@
<div class="transparent">
<div class="card-content">
<div class="section">
<div class="section-title">ABOUT ME</div>
<div class="section-title center">ABOUT ME</div>
<div class="divider"></div>
<div class="about-me">{{ profile.about_me }}</div>
<div class="about-me center"><i>{{ profile.about_me }}</i></div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion project/accounts/templates/accounts/register/entry_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{% block content %}
<div class="valign center">
<div class="logo center">
<div style="margin-top:15px;" class="logo center">
<object class="logo-img" type="image/svg+xml" data="{% static "img/logo-civiwiki-tree-white.svg" %}" height="64px"></object>
<span class="wordmark">CiviWiki</span>
</div>
Expand Down
3 changes: 2 additions & 1 deletion project/core/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@

{% include "global_nav.html" %}

{% include "static_footer.html" %}
{%block content%}{%endblock content%}
{% include "static_footer.html" %}

{% block extra_js %}{% endblock extra_js %}

</body>
Expand Down
5 changes: 3 additions & 2 deletions project/core/templates/global_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% load static %}
{% load notifications_tags %}
<nav class="nav" id="js-global-nav">
<div class="nav-wrapper ">
<div class="nav-wrapper " >
<!-- Left Nav (Logo) -->
<a href="/" class="logo nav-item">
<img class="logo-img" src="{% static 'img/logo-civiwiki-tree-white.svg' %}" alt="CiviWiki" height="36px">
<img class="logo-img" style="position: relative; width: 40px; height: 40px; left: -3px; top: -17px;" src="{% static 'img/logo-civiwiki-tree-white.svg' %}" alt="CiviWiki" >
<span class="wordmark">CiviWiki</span>
</a>

Expand All @@ -27,6 +27,7 @@
<div class="dropdown-menu-wrapper hide" id="js-dropdown-menu">
<div class="dropdown-menu">
<a class="dropdown-item" href="/" id="my-feed">My Feed</a>
<a class="dropdown-item" id="my-profile-button" href="{% url 'profile' user.username %}">My Activity</a>
<a class="dropdown-item" id="my-profile-button" href="{% url 'profile' user.username %}">My Profile</a>
<div class="divider"></div>
<a class="dropdown-item" id="settings-dropdown" href="/settings">Settings</a>
Expand Down
65 changes: 37 additions & 28 deletions project/core/templates/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<link rel="stylesheet" href="./static/less/landing.css">
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet">
</head>

<body>
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
Expand Down Expand Up @@ -74,22 +75,22 @@ <h2 class="landing-msg anim-typewriter">Building Democracy for a Better Age.</h2
</div>
<div class="msg-1">
<h1 class="title">
{% translate "CiviWiki is a non-profit community working to develop a democratic engagement web system." %}
{% translate "CiviWiki is a non-profit community working to develop a democratic engagement web system."%}
</h1><br><br>
<p class="subtitle">
{% blocktranslate %}
At CiviWiki we believe democracy works best when citizens are educated on issues and participate in the
democratic process.
democratic process.
We are a non-profit, non-partisan, community; working to build an open-source platform where citizens
discuss the problems they face, discover solutions, and enact change.
discuss the problems they face, discover solutions, and enact change.
{% endblocktranslate %}
</p>
</div><br><br><br>
<div class="video">
<p class="video-text">
{% translate "Check out our short video describing CiviWiki..." %}
</p>
<iframe width="640" height="480" src="https://www.youtube.com/embed/Ll4VZv4a8bE" frameborder="0"
<iframe width="640" height="480" src="https://www.youtube.com/embed/Ll4VZv4a8bE" frameborder="0"
allowfullscreen></iframe>
<p class="small-text">{% translate "Video made by" %}
<a class="body-link" href="https://sheldonanim.com/" target="_blank">Jon Sheldon</a>
Expand All @@ -100,33 +101,34 @@ <h1 class="title">{% translate "Why CiviWiki?" %}</h1>
<table class="why-table">
<tr class="tr-why">
<td><span class="icon">
<i class="large material-icons">group</i>
</span></td>
<i class="large material-icons">group</i>
</span></td>
<td>
<h2 class="subtitle">{% translate "Democratically Contributed Media" %}</h2>
<div class="text">
<p>
{% blocktranslate %}
As the name CiviWiki implies, our core content will be contributed
As the name CiviWiki implies, our core content will be contributed
by volunteers on our Wiki.
Our topic format is modular.
The structure both allows a community of volunteers to collaborate on a
The structure both allows a community of volunteers to collaborate on a
single political issue, and reserves space for dissenting opinions.
{% endblocktranslate %}
{% endblocktranslate %}
</p>
</div>
</td>
</tr>
<tr class="tr-why">
<td><h2 class="subtitle">{% translate "Personalized Policy Feed" %}</h2>
<td>
<h2 class="subtitle">{% translate "Personalized Policy Feed" %}</h2>
<p>
{% blocktranslate %}
CiviWiki intelligently personalizes users' feed in two meaningful ways.
First, the issues promoted to users' feed will be personalized to the user's
CiviWiki intelligently personalizes users' feed in two meaningful ways.
First, the issues promoted to users' feed will be personalized to the user's
expressed interests, and the timeliness of the issue.
Second, the structure of the issue topics break policy positions into
bite-sized contentions we call Civies. Each Civi is logically related
to the rest of the topic. Based on the user's support, opposition, or
Second, the structure of the issue topics break policy positions into
bite-sized contentions we call Civies. Each Civi is logically related
to the rest of the topic. Based on the user's support, opposition, or
neutrality to each Civi, CiviWiki promotes different relevant content
{% endblocktranslate %}
</p>
Expand All @@ -140,36 +142,43 @@ <h2 class="subtitle">{% translate "Democratically Contributed Media" %}</h2>
</table><br><br>
</div><br><br><br>
<div class="subtitle center">
<p>{% translate "See what your voice can bring to your community!" %}</p><a href="/login/"><button class="ripple">Join CiviWiki</button></a>
<div style="margin-bottom: 14px;">
<p>{% translate "See what your voice can bring to your community!" %}</p>
</div>
<a href="/login/"><button class="ripple">Join CiviWiki</button></a>
</div><br><br><br><br>
<div class="subtitle center">
<p class="text">{% translate "CiviWiki is still in development!" %}</p>
<a href="/login/">
<button class="ripple">{% translate "Register" %}</button></a>
<div style="margin-bottom: 14px;">
<p class="text">{% translate "CiviWiki is still in development!" %}</p>
</div>
<div style="margin-bottom: 20px;"><a href="/login/">
<button class="ripple">{% translate "Register" %}</button></a>
&
<a href="/support_us/"><button class="ripple">{% translate "Support Us" %}</button></a>
</div>
</div>
</main>
<footer>
<table class="footer">
<tr>
<th>{% translate "Connect With Us" %}</th>
<th style="padding-bottom: 10px;">{% translate "Connect With Us" %}</th>
<th>{% translate "Developers" %}</th>
</tr>
<tr>
<td><a class="body-link" href="http://github.com/CiviWiki/OpenCiviWiki" target="_blank" rel="noopener noreferrer">Github</a></td>
</tr>
<tr>
<td><a class="body-link" href="https://www.facebook.com/CiviWiki/" target="_blank">Facebook</a></td>
<td><a class="body-link" href="http://github.com/CiviWiki/OpenCiviWiki" target="_blank"
rel="noopener noreferrer">Github</a></td>
<td><a class="body-link" href="https://github.com/CiviWiki/OpenCiviWiki/issues" target="_blank">{% translate "Open Issues" %}</a></td>
</tr>
<tr>
<td><a class="body-link" href="https://twitter.com/civiwiki" target="_blank" rel="noopener noreferrer">Twitter</a></td>
<td><a class="body-link" href="https://waffle.io/CiviWiki/OpenCiviWiki" target="_blank" rel="noopener noreferrer">{% translate "Development Roadmap" %}</a></td>
<td><a class="body-link" href="https://www.facebook.com/CiviWiki/" target="_blank">Facebook</a></td>
<td><a class="body-link" href="https://waffle.io/CiviWiki/OpenCiviWiki" target="_blank"
rel="noopener noreferrer">{% translate "Development Roadmap" %}</a></td>
</tr>
<tr>
<td> </td>
<td><a class="body-link" href="https://riot.im/app/#/room/#CiviWiki:matrix.org" target="_blank" rel="noopener noreferrer">{% translate "Live Chat on Matrix" %}</a></td>
<td><a class="body-link" href="https://twitter.com/civiwiki" target="_blank"
rel="noopener noreferrer">Twitter</a></td>
<td><a class="body-link" href="https://riot.im/app/#/room/#CiviWiki:matrix.org" target="_blank"
rel="noopener noreferrer">{% translate "Live Chat on Matrix" %}</a></td>
</tr>
</table>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion project/core/templates/static/less/login.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body {
// background-image: linear-gradient(to bottom, #0E0038 30%, #260A66 100%);
}
.entry-base {
height: 100vh;
height: 80vh;
align-items: center;
justify-content: center;
.wrapper {
Expand Down
29 changes: 15 additions & 14 deletions project/core/templates/static_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@
<div class="container">
<div class="row center">
<div class="col s6 m3 push-m6 right-align">
<div class="external-link-header subtitle-lato grey-text">{% trans "Connect with Us" %}</div>
<div class="external-links grey-text text-darken-2 right-align">
<div class="external-link-header subtitle-lato white-text" style="color: #f5f5f5 " >{% trans "Connect with Us" %}</div>
<div class="external-links black-text text-darken-2 right-align">
<div class="external-link-item">
<a class="grey-text text-darken-1" href="mailto:[email protected]">{% trans "Email" %}</a>
<a class="black-text text-darken-1" href="mailto:[email protected]">{% trans "Email" %}</a>
</div>
<div class="external-link-item">
<a class="grey-text text-darken-1" href="https://www.facebook.com/CiviWiki/" target="_blank">Facebook</a>
<a class="black-text text-darken-1" href="https://www.facebook.com/CiviWiki/" target="_blank">Facebook</a>
</div>
<div class="external-link-item">
<a class="grey-text text-darken-1" href="https://twitter.com/civiwiki" target="_blank">Twitter</a>
<a class="black-text text-darken-1" href="https://twitter.com/civiwiki" target="_blank">Twitter</a>
</div>
</div>
</div>
<div class="col s6 m3 push-m6 right-align">
<div class="external-link-header subtitle-lato grey-text">{% trans "Developers" %}</div>
<div class="external-links grey-text text-darken-2 right-align">
<div class="external-link-header subtitle-lato white-text">{% trans "Developers" %}</div>
<div class="external-links black-text text-darken-2 right-align">
<div class="external-link-item">
<a class="grey-text text-darken-1" href="https://github.com/CiviWiki/OpenCiviWiki" target="_blank">GitHub</a></div>
<a class="black-text text-darken-1" href="https://github.com/CiviWiki/OpenCiviWiki" target="_blank">GitHub</a></div>
<div class="external-link-item">
<a class="grey-text text-darken-1" href="https://github.com/CiviWiki/OpenCiviWiki/issues" target="_blank">{% trans "Open Issues" %}</a>
<a class="black-text text-darken-1" href="https://github.com/CiviWiki/OpenCiviWiki/issues" target="_blank">{% trans "Open Issues" %}</a>
</div>
<div class="external-link-item">
<a class="grey-text text-darken-1" href="https://waffle.io/CiviWiki/OpenCiviWiki" target="_blank">{% trans "Development Roadmap" %}</a>
<a class="black-text text-darken-1" href="https://waffle.io/CiviWiki/OpenCiviWiki" target="_blank">{% trans "Development Roadmap" %}</a>
</div>
<div class="external-link-item">
<a class="grey-text text-darken-1" href="https://riot.im/app/#/room/#CiviWiki:matrix.org" target="_blank">{% trans "Live Chat on Matrix" %}</a>
<a class="black-text text-darken-1" href="https://riot.im/app/#/room/#CiviWiki:matrix.org" target="_blank">{% trans "Live Chat on Matrix" %}</a>
</div>
</div>
</div>
Expand All @@ -41,10 +41,11 @@
<!-- Bottom block -->
<div class="footer-copyright">
<div class="container">
<div class="grey-text text-darken-1">
<a href="/"><object class="logo-img" type="image/svg+xml" data="{% static "img/logo-civiwiki-tree-white.svg" %}" height="32px"></object><span class="wordmark">CiviWiki</span></a>
<div class="white-text text-darken-1">
<a href="/"><object class="logo-img" style="position: relative; width: 40px; height: 40px; left: -25px; top: 8px;" type="image/svg+xml" data="{% static "img/logo-civiwiki-tree-white.svg" %}" ></object>
<span class="wordmark" style="position: relative; left: -29px; top: -8px;" >CiviWiki</span></a>
<div class="footer-right right">
<!-- TODO: <a class="grey-text" href="policy">Privacy Policy</a> | -->
<!-- TODO: <a class="black-text" href="policy">Privacy Policy</a> | -->
</div>
</div>
</div>
Expand Down