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

Remove Bootstrap [WIP] #131

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Remove Bootstrap [WIP] #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fe6ccf8
Remove bootstrap from general layout
stefankoegl Jul 1, 2018
4f23d1b
Merge branch 'master' into no-bootstrap
stefankoegl Aug 4, 2018
84a3b6d
Merge branch 'master' into no-bootstrap
stefankoegl Aug 15, 2018
34b912d
Highlight active navigation entries
stefankoegl Aug 15, 2018
75c3638
Define podcast-box component, use on dashboard
stefankoegl Aug 15, 2018
e0cd178
Improve layout of Podcast directory
stefankoegl Aug 15, 2018
02a796e
Remove bootstrap from embed template
stefankoegl Aug 19, 2018
843ec77
Simplify primary navigation
stefankoegl Oct 15, 2018
1f580ef
Remove secondary navigation from "gpodder.net" primary nav
stefankoegl Oct 15, 2018
fda9d91
Remove secondary navigation from "Directory" primary nav
stefankoegl Oct 15, 2018
fb0d5ba
Remove secondary navigation from "Subscriptions" primary nav
stefankoegl Oct 15, 2018
00d9d6d
Remove secondary navigation from "Community" primary nav
stefankoegl Oct 15, 2018
b027a8e
Remove secondary navigation from "Publisher" primary nav
stefankoegl Oct 15, 2018
4502a3b
Completely remove secondary navigation
stefankoegl Oct 20, 2018
4312821
Merge pull request #149 from gpodder/simple-nav
stefankoegl Oct 20, 2018
a7fb4b7
Merge branch 'master' into no-bootstrap
stefankoegl Oct 20, 2018
9606c48
Show subscribed podcasts in secondary navigation
stefankoegl Oct 23, 2018
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
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/activate-user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Activate User" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/clients.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
{% load charts %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Admin Area" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/filetypes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
{% load charts %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "File Type Stats" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/hostinfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
{% load time %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Host Information" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/make-publisher-input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Publisher Permissions" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/make-publisher-result.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Publisher Permissions" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/merge-grouping.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
{% load podcasts %}
{% load episodes %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Admin Area" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/merge-select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Admin Area" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Admin Area" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/stats.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load charts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Admin Area" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/task-status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block head %}
{% if not ready %}
<meta http-equiv="refresh" content="10">
Expand Down
4 changes: 0 additions & 4 deletions mygpo/administration/templates/admin/useragents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{% load i18n %}
{% load charts %}

{% load menu %}
{% block mainmenu %}{{ "/admin/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/admin/"|section_menu:"Admin" }}{% endblock %}

{% block title %}{% trans "Admin Area" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/carousel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
{% load utils %}
{% load cache %}

{% load menu %}
{% block mainmenu %}{{ "/directory/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/directory/"|section_menu }}{% endblock %}

{% block head %}

<style language="text/css">
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/category.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
{% load math %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/directory/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/directory/"|section_menu:category }}{% endblock %}

{% block title %}{{ category }}{% endblock %}

{% block header %}
Expand Down
142 changes: 48 additions & 94 deletions mygpo/directory/templates/directory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
{% load math %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/directory/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/directory/"|section_menu }}{% endblock %}

{% block title %}{% trans "Podcast Directory" %}{% endblock %}

{% block header %}
<h1>{% trans "Podcast Directory" %}</h1>

<nav>
<ul class="sections">
<li><a href="{% url "search" %}">Search Podcasts</a></li>
<li><a href="{% url "podcast-lists" %}">Podcast Lists</a></li>
<li><a href="{% url "suggestions" %}">Suggested Podcasts</a></li>
<li><a href="{% url "license-podcasts" %}">Podcast Licenses</a></li>
<li><a href="{% url "toplist" %}">Podcast Toplist</a></li>
<li><a href="{% url "episode-toplist" %}">Episode Toplist</a></li>
</li>
</nav>

{% endblock %}


{% block content %}
{% for c in topics.categories %}

{% if forloop.counter0|divisibleby:"2" %}
<div class="row">
{% endif %}

<div class="col-md-6">
{% if c.cls == "PodcastList" %}
{% url "user" c.username as user-lists-url %}
<h2>{% blocktrans with c.title as listtitle and c.username as username %}{{ listtitle }} <span class="by-user">by <a href="{{ user-lists-url }}">{{ username }}</a></span>{% endblocktrans %}</h2>
{% else %}
<h2>{{ c.title }}</h2>
{% endif %}
<div class="categories">

{% for c in topics.categories %}
<div>
<h2>{{ c.title }}</h2>
<table class="list">
{% for entry in c.podcasts|slice:":10" %}
<tr>
Expand All @@ -42,22 +42,46 @@ <h2>{{ c.title }}</h2>
<tr>
<td></td>
<td>
{% if c.cls == "PodcastList" %}
<a href="{% url "list-show" c.username c.slug %}">{% trans "more..." %}</a>
{% else %}
<a href="{% url "directory" c.clean_title %}">{% trans "more..." %}</a>
{% endif %}
<a href="{% url "directory" c.clean_title %}">{% trans "more..." %}</a>
<td></td>
</tr>
</table>
</div>
{% endfor %}

{% if forloop.counter|divisibleby:"2" %}
</div>
{% endif %}
{% if podcast_ad %}
<div class="ad">
{% include "podcast-ad-box.html" with podcast_ad=podcast_ad only %}
</div>
{% endif %}

{% for pl in podcastlists %}
<div>
<h2>{{ pl.title }}
{% url "user" pl.user.username as user_lists_url %}
<span class="by-user">{% trans "by" %} <a href="{{ user_lists_url }}">{{ pl.user.username }}</a></span>
</h2>

<table class="list">
{% for entry in pl.entries.all|slice:":10" %}
<tr>
<td class="logo">{{ entry.podcast|podcast_logo }}</td>
<td>{% podcast_group_link entry.podcast %}</td>
</tr>
{% endfor %}
<tr>
<td></td>
<td>
<a href="{% url "list-show" pl.user.username pl.slug %}">{% trans "more..." %}</a>
<td></td>
</tr>
</table>
</div>
{% endfor %}


</div>

<hr style="clear: both;"/>

<div id="tagcloud">
Expand All @@ -68,73 +92,3 @@ <h2>{{ c.title }}</h2>
{% endfor %}
</div>
{% endblock %}


{% block sidebar %}

{% include "podcast-ad-box.html" with podcast_ad=podcast_ad only %}


{% for podcastlist in podcastlists %}
{% if podcastlist and podcastlist.user.username %}
<div class="well">
<h4>
<a href="{% url "list-show" podcastlist.user.username podcastlist.slug %}">
{{ podcastlist.title }}
</a>
<small>{% trans "Podcast List by" %}
<a href="{% url "lists-user" podcastlist.user.username %}">
{{ podcastlist.user.username }}
</a>
</small>
</h4>

<div class="logo-group">
{% for podcast in podcastlist.podcasts %}

<a href="{% podcast_link_target podcast %}">
{{ podcast|podcast_logo }}
</a>

{% endfor %}

{% if podcastlist.more_podcasts %}
{% blocktrans with podcastlist.more_podcasts as more %}and {{ more }} more{% endblocktrans %}
{% endif %}
</div>

<div class="btn-group">
<a class="btn btn-primary" href="{% url "lists-overview" %}">
{% trans "Create a Podcast List" %}
</a>
</div>

</div>
{% endif %}
{% endfor %}

{% if random_podcast %}
<div class="well">

<h4><small>{% trans "Random" %}</small></h4>


<a href="{% podcast_link_target random_podcast %}">
<div id="podcastlogo">{{ random_podcast|podcast_logo_medium }}</div>
</a>

<h4>{{ random_podcast.title }}</h4>

<p class="description">
{{ random_podcast.description|default:""|truncatewords:"50" }}
</p>

<p>
<a href="{% podcast_link_target random_podcast %}">{% trans "more..." %}</a>
</p>

</div>
{% endif %}

{% endblock %}

4 changes: 0 additions & 4 deletions mygpo/directory/templates/directory/add-podcast-status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
{% load i18n %}
{% load podcasts %}

{% load menu %}
{% block mainmenu %}{{ "/missing/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/missing/"|section_menu }}{% endblock %}

{% block head %}
<meta http-equiv="refresh" content="10">
{% endblock %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/directory/license-podcasts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
{% load math %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/directory/+license"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/directory/+license"|section_menu }}{% endblock %}

{% block title %}{% blocktrans with view.license_url|license_name as licensename %}Podcasts with License {{ licensename }}{% endblocktrans %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/directory/licenses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
{% load math %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/directory/+license"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/directory/+license"|section_menu }}{% endblock %}

{% block title %}{% trans "Podcasts with License Information" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/episode_toplist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
{% load charts %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/toplist/episodes"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/toplist/episodes"|section_menu }}{% endblock %}

{% block title %}{% trans "Episode-Toplist" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/missing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
{% load podcasts %}
{% load charts %}

{% load menu %}
{% block mainmenu %}{{ "/missing/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/missing/"|section_menu }}{% endblock %}

{% block title %}{% trans "Missing Podcast" %}{% endblock %}

{% block header %}
Expand Down
4 changes: 0 additions & 4 deletions mygpo/directory/templates/podcast_lists.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
{% load math %}
{% load utils %}

{% load menu %}
{% block mainmenu %}{{ "/directory/"|main_menu }}{% endblock %}
{% block sectionmenu %}{{ "/lists/"|section_menu }}{% endblock %}

{% block title %}{% trans "Podcast Lists" %}{% endblock %}

{% block header %}
Expand Down
Loading