changes from 15 nov

7 files changed, 9 insertions, 15 deletions

diff --git a/media/archweb.css b/media/archweb.css
index d4992686..a99dab68 100644
--- a/media/archweb.css
+++ b/media/archweb.css
@@ -113,9 +113,9 @@ ul.errorlist { color: red; }
 #news .timestamp { float: right; font-size: 0.85em; margin: -1.8em 0.5em 0 0; }

 

 /* home: pkgsearch box */

-#pkgsearch { padding: 1em 0.75em; background: #787DAB; color: #fff; border: 1px solid #0013bb; } 

+#pkgsearch { padding: 1em 0.75em; background: #787DAB; color: #fff; border: 1px solid #3c47ab; } 

 #pkgsearch label { width: auto; padding: 0.1em 0; }

-#pkgsearch input { width: 10em; float: right; font-size: 1em; color: #000; background: #fff; border: 1px solid #0014cc; }

+#pkgsearch input { width: 10em; float: right; font-size: 1em; color: #000; background: #fff; border: 1px solid #3c47ab; }

 

 /* home: recent pkg updates */

 #pkg-updates h3 { margin: 0 0 0.3em; }

diff --git a/media/devs/gtklocker.png b/media/devs/gtklocker.png
new file mode 100755
index 00000000..8595008a
--- /dev/null
+++ b/media/devs/gtklocker.png
diff --git a/media/devs/me001-crop.png b/media/devs/me001-crop.png
new file mode 100755
index 00000000..8595008a
--- /dev/null
+++ b/media/devs/me001-crop.png
diff --git a/public/views.py b/public/views.py
index 7d10e74f..1c385fed 100644
--- a/public/views.py
+++ b/public/views.py
@@ -19,15 +19,12 @@ def index(request):
 
 def userlist(request, type='Developers'):
     users = User.objects.order_by('username').select_related('userprofile')
-    if type == 'Developers':
-        users = users.filter(is_active=True, groups__name="Developers")
-        msg = "This is a list of the current Arch Linux Developers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties."
-    elif type == 'Trusted Users':
-        users = users.filter(is_active=True, groups__name="Trusted Users")
-        msg = "Here are all your friendly Arch Linux Trusted Users who are in charge of the [community] repository."
+    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."
     elif type == 'Fellows':
         users = users.filter(is_active=False)
-        msg = "Below you can find a list of ex-developers (aka project fellows). These folks helped make Arch what it is today. Thanks!"
+        msg = "Below you can find a list of ex-hackers (aka project fellows). These folks helped make Parabola what it is today. Thanks!"
 
     context = {
         'user_type': type,
diff --git a/templates/public/about.html b/templates/public/about.html
index 44f76df0..5c9dc16d 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -56,7 +56,6 @@
         <li>Take a look at our <a href="http://wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li>
     </ul> 
 
-    <p><a href='http://www.archlinux.org/about/' title='Go to Archlinux About page'>Read more about Archlinux...</a></p>
 </div>
 {% endblock %}
 
diff --git a/templates/public/index.html b/templates/public/index.html
index 325358d6..708c5347 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -155,9 +155,8 @@
         <li><a href="{% url page-art %}" title="Parabola logos and other artwork for promotional use">Logos &amp; 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>
-        <li><a href="{% url page-devs %}" title="Active developers">Developer Profiles</a></li>
-        <li><a href="{% url page-tus %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
-        <li><a href="{% url page-fellows %}" title="Retired Developers">Fellows Profiles</a></li>
+        <li><a href="{% url page-devs %}" title="Active hackers">Hackers Profiles</a></li>
+        <li><a href="{% url page-fellows %}" title="Retired hackers">Fellows Profiles</a></li>
     </ul>
 
 </div><!-- #nav-sidebar -->
diff --git a/urls.py b/urls.py
index 5c792035..1f8bc7a6 100644
--- a/urls.py
+++ b/urls.py
@@ -117,8 +117,7 @@ urlpatterns = patterns('',
     (r'^about/$', direct_to_template, {'template': 'public/about.html'}, 'page-about'),
     (r'^art/$', direct_to_template, {'template': 'public/art.html'}, 'page-art'),
     (r'^svn/$', direct_to_template, {'template': 'public/svn.html'}, 'page-svn'),
-    (r'^developers/$',   'public.views.userlist', { 'type':'Developers' }, 'page-devs'),
-    (r'^trustedusers/$', 'public.views.userlist', { 'type':'Trusted Users' }, 'page-tus'),
+    (r'^hackers/$',   'public.views.userlist', { 'type':'Hackers' }, 'page-devs'),
     (r'^fellows/$',      'public.views.userlist', { 'type':'Fellows' }, 'page-fellows'),
     (r'^donate/$', 'public.views.donate', {}, 'page-donate'),
     (r'^download/$', 'public.views.download', {}, 'page-download'),