diff options
| -rw-r--r-- | public/views.py | 2 | ||||
| -rw-r--r-- | templates/public/art.html | 11 | ||||
| -rw-r--r-- | templates/public/donate.html | 19 | ||||
| -rw-r--r-- | templates/public/feeds.html | 68 | ||||
| -rw-r--r-- | templates/public/index.html | 20 |
5 files changed, 32 insertions, 88 deletions
diff --git a/public/views.py b/public/views.py index 1c385fed..43cc5882 100644 --- a/public/views.py +++ b/public/views.py @@ -21,7 +21,7 @@ def userlist(request, type='Developers'): users = User.objects.order_by('username').select_related('userprofile') if type == 'Hackers': users = users.filter(is_active=True, groups__name="Hackers") - msg = "This is a list of the current Parabola GNU/Linux hackers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties." + msg = "This is a list of the current Parabola GNU/Linux hackers. They maintain the *-libre packages in addition to doing any other developer duties." elif type == 'Fellows': users = users.filter(is_active=False) msg = "Below you can find a list of ex-hackers (aka project fellows). These folks helped make Parabola what it is today. Thanks!" diff --git a/templates/public/art.html b/templates/public/art.html index 0a6dbb83..68179f23 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -8,18 +8,19 @@ <h2>Parabola Logos and Artwork</h2> - <p> You can help by creating artwork for Parabola GNU/Linux. </p> + <p>You can help by creating artwork for Parabola GNU/Linux-libre.</p> - <p> Send your desings to web@list.parabolagnulinux.org and state they are CC-by-sa - or another free culture license </p> + <p>Send your designs to web@list.parabolagnulinux.org and state they are CC-by-sa + or another free culture friendly license.</p> + {% comment %} <h3>Logos for Press Usage</h3> <p>The following Parabola logos are available for press and other use.</p> - <p><strong>Two-color standard version</strong><br /> + <p><strong>Two-color standard version</strong><br/> {% comment %} <!-- This is an example of how images should be added here --> @@ -31,7 +32,6 @@ <img src="{% cdnprefix %}/media/logos/parabola-logo-dark-90dpi.png" alt="Parabola PNG logo @ 90dpi" title="Parabola PNG logo @ 90dpi" /> -{% endcomment %} <p><strong>Two-color inverted version</strong> (for dark backgrounds)<br /> @@ -54,6 +54,7 @@ <li><strong>parabola-themes-kdm</strong> - KDM login themes</li> <li><strong>parabola-themes-slim</strong> - SLiM login themes</li> </ul> +{% endcomment %} </div><!-- #artwork --> {% endblock %} diff --git a/templates/public/donate.html b/templates/public/donate.html index 290e4bb7..ef7f252d 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -19,24 +19,9 @@ <p>If you want, we have a pretty nice <a href='http://wiki.parabolagnulinux.org/TODO' title='The TODO - list!'>TODO list</a> you can check to help us.</p> + list!'>TODO list</a> you can check to help us by donating some of your + time. That will be very much appreciated by us :)</p> -{% comment %} -<!-- TODO: --> - <p> We'd like to thank <!-- the guy wich donated the vserver or his company --></p> -{% endcomment %} -{% comment %} - <h3>Past donors</h3> - - <div id="donor-list"> - <ul> - {% for donor in donors %} - <li>{{ donor.name }}</li>{% endfor %} - </ul> - </div> - <div class="clear"></div> - <p>A huge thanks to you all for your contributions!</p> -{% endcomment %} </div> {% endcache %} {% endblock %} diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 16e71afe..11bc496b 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -12,13 +12,16 @@ <h3>News and Activity Feeds</h3> - <p>Grab the <a href="/feeds/news/" class="rss" title="Parabola News feed">news item feed</a> - to keep up-to-date with the latest news from the Parabola development staff.</p> + <p>Grab the <a href="/feeds/news/" class="rss" title="Parabola News + feed">news item feed</a> to keep up-to-date with the latest news from + the Parabola staff.</p> - <p>The <a href="https://wiki.archlinux.org/index.php?title=Special:RecentChanges&feed=rss" - title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a> - is also available to track document changes from the <a href="https://wiki.archlinux.org/" - title="Arch Wiki community documentation">Arch Wiki</a>.</p> + <p>The <a + href="http://wiki.parabolagnulinux.org/index.php?title=Special:RecentChanges&feed=rss" + title="ArchWiki Recent Changes feed" class="rss">Parabola Wiki: Recent + changes feed</a> is also available to track document changes from the + <a href="https://wiki.parabolagnulinux.org/" title="Parabola Wiki community + documentation">Parabola Wiki</a>.</p> <h3>Package Feeds</h3> @@ -56,56 +59,11 @@ </table> <p>A <a href="https://aur.archlinux.org/rss.php" class="rss" title="AUR newest packages feed">newest packages feed</a> - is also available from the <a href="https://aur.archlinux.org/" title="AUR Homepage">Arch User Repository (AUR)</a>.</p> + is also available from the <a href="https://aur.archlinux.org/" title="AUR + Homepage">Arch User Repository (AUR)</a>, but be specially aware that sometimes, + unfree software gets uploaded there, <em>at least until we found a solution + to it.</em></p> - <h3>Development Feeds</h3> - - <p>Subscribe to any of the following to track bug tickets and feature - requests from the <a href="https://bugs.archlinux.org/" title="Parabola Bugs">Parabola Bugtracker</a>:</p> - - <table class="pretty2"> - <thead> - <tr> - <th>Project</th> - <th>Recently Opened Tasks</th> - <th>Recently Edited Tasks</th> - <th>Recently Closed Tasks</th> - </tr> - </thead> - <tbody> - <tr> - <td>All Projects</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=99" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=99" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=99" class="rss">Feed</a></td> - </tr><tr> - <td>Parabola</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=1" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=1" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=1" class="rss">Feed</a></td> - </tr><tr> - <td>Release Engineering</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=6" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=6" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=6" class="rss">Feed</a></td> - </tr><tr> - <td>Pacman Development</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=3" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=3" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=3" class="rss">Feed</a></td> - </tr><tr> - <td>Community Packages</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=5" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=5" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=5" class="rss">Feed</a></td> - </tr><tr> - <td>AUR</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=2" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=2" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=2" class="rss">Feed</a></td> - </tr> - </tbody> - </table> </div> {% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 6555debc..f841c2ef 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -132,16 +132,16 @@ title="View/search the package repository database">Packages</a></li> <li><a href="/groups/" title="View the available package groups">Package Groups</a></li> - <li><a href="https://bugs.parabola.kiwwwi.com.ar/" - title="Report/track bugs or make feature requests">Bug Tracker</a></li> - <li><a href="{% url page-svn %}" - title="View SVN entries for packages">SVN Repositories</a></li> - <li><a href="http://projects.parabola.kiwwwi.com.ar/" + <li><a href="http://projects.parabolagnulinux.org" title="Official Parabola projects (git)">Projects in Git</a></li> - <li><a href="https://wiki.parabola.kiwwwi.com.ar/index.php/DeveloperWiki" - title="Developer Wiki articles">DeveloperWiki</a></li> + <li><a href="http://wiki.parabolagnulinux.org/Category:Parabola/Hacking" + title="Hacking on Parabola">Parabola Hacking</a></li> + <li><a href="http://wiki.parabolagnulinux.org/TODO" + title="Help with the Parabola development">TODO list</a></li> + {% comment %} <li><a href="/todolists/" - title="Developer Todo Lists">Todo Lists</a></li> + title="Todo Lists">Todo Lists</a></li> + {% endcomment %} </ul> <h4>About</h4> @@ -150,8 +150,8 @@ <li><a href="{% url page-about %}" title="Learn more about Parabola">About Parabola</a></li> <li><a href="/download/" title="Get Parabola">Download Parabola</a></li> - <li><a href="https://wiki.parabola.kiwwwi.com.ar/index.php/Parabola_Press_Review" - title="Parabola in the media">Press Coverage</a></li> + <li><a href="http://wiki.parabolagnulinux.org/Media" + title="Parabola in the media">Media Appearances</a></li> <li><a href="{% url page-art %}" title="Parabola logos and other artwork for promotional use">Logos & Artwork</a></li> <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li> <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li> |