From 5fa547431332f4d6e416ad8904d52c953a1eb309 Mon Sep 17 00:00:00 2001
From: zuber <marek@stepniowski.com>
Date: Tue, 9 Feb 2010 13:56:50 +0100
Subject: [PATCH] =?utf8?q?Podlinkowanie=20logo=20do=20strony=20g=C5=82?=
 =?utf8?q?=C3=B3wnej.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 platforma/static/css/master.css               |  7 ++-
 .../templates/wiki/document_details.html      |  2 +-
 platforma/urls.py                             | 48 +++++++------------
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css
index 9d3efeca..faa67aca 100755
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -61,7 +61,7 @@ body {
     font-weight: bold;
 }
 
-#header h1 {
+#header h1, #header h1 a {
     margin: 0;
     padding: 0;
     font: 17px Helvetica, Verdana, sans-serif;
@@ -72,6 +72,11 @@ body {
     line-height: 20px;
 }
 
+#header h1 a {
+    text-decoration: none;
+    color: #222;
+}
+
 #tabs {
     margin: 0;
     padding: 0;
diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
index ad71c847..dcd43d14 100644
--- a/platforma/templates/wiki/document_details.html
+++ b/platforma/templates/wiki/document_details.html
@@ -28,7 +28,7 @@
         </div>
         <div id="header">
             <div id="tools" style="float: right;">Wersja: <span id="document-revision">{{ document.revision }}</span> <button style="margin-left: 6px" id="save-button">Zapisz</button></div>
-            <h1>Platforma</h1>
+            <h1><a href="{% url wiki.views.document_list %}">Platforma</a></h1>
             <ol id="tabs">
                 <li id="simple-view-tab"><span id="document-name">{{ document.name }}</span></li>
                 <li id="source-view-tab" class="active">Kod źródłowy</li>
diff --git a/platforma/urls.py b/platforma/urls.py
index 19dfc03d..ea9ba258 100755
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -8,33 +8,31 @@ admin.autodiscover()
 PATH_SEC = r"(?P<path>[^/]+)"
 PATH_END = PATH_SEC + "/$"
 
-urlpatterns = patterns('',
-    # Explorer:
-    # url(r'^$', 'explorer.views.file_list', name='file_list'),        
-    # url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'),    
 
-    # url(r'^management/pull-requests$', 'explorer.views.pull_requests'),
-  
-    # Editor panels
-    # url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'),
-    # url(r'^editor/$', 'explorer.views.file_list', name='editor_base'),
 
-    # url(r'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"),
+urlpatterns = patterns('')
 
+if 'cas_consumer' in settings.INSTALLED_APPS:
+    urlpatterns += patterns('',
+        # django-cas-consumer
+        url(r'^accounts/login/$', 'cas_consumer.views.login', name='login'),
+        url(r'^accounts/logout/$', 'cas_consumer.views.logout', name='logout'),
+    )
+else:
+    urlpatterns += patterns('',
+        # Django auth
+        url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name='login'),
+        url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),    
+    )
+
+urlpatterns += patterns('',
     url(r'^$', 'wiki.views.document_list'),
-    
+    url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
+        
     # Admin panel
     (r'^admin/filebrowser/', include('filebrowser.urls')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(.*)', admin.site.root),
-
-    # Theme database
-    # url(r'themes/', include('bookthemes.urls')),
-
-    # Our über-restful api
-    # url(r'^api/', include('api.urls')),
-    
-    url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
     
     # Static files (should be served by Apache)
     url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
@@ -46,15 +44,3 @@ urlpatterns = patterns('',
     
 )
 
-if 'cas_consumer' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
-        # django-cas-consumer
-        url(r'^accounts/login/$', 'cas_consumer.views.login', name='login'),
-        url(r'^accounts/logout/$', 'cas_consumer.views.logout', name='logout'),
-    )
-else:
-    urlpatterns += patterns('',
-        # Django auth
-        url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name='login'),
-        url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),    
-    )
-- 
2.20.1