Move cirruculum app to mil site

diff --git a/curriculum/templates/curriculum/competence_detail.html b/curriculum/templates/curriculum/competence_detail.html
index 3a4bde4..d850f31 100755 (executable)
--- a/curriculum/templates/curriculum/competence_detail.html
+++ b/curriculum/templates/curriculum/competence_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "mil/base.html" %}

 
 {% block title %}{{ object }}{% endblock %}
 
 
 {% block title %}{{ object }}{% endblock %}
 

diff --git a/curriculum/templates/curriculum/competence_list.html b/curriculum/templates/curriculum/competence_list.html
index 5597c8c..8b1de32 100755 (executable)
--- a/curriculum/templates/curriculum/competence_list.html
+++ b/curriculum/templates/curriculum/competence_list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "mil/base.html" %}

 {% load chunks %}
 
 {% block title %}Katalog kompetencji medialnych i informacyjnych{% endblock %}
 {% load chunks %}
 
 {% block title %}Katalog kompetencji medialnych i informacyjnych{% endblock %}

diff --git a/edumed/templates/base.html b/edumed/templates/base.html
index 6b825e6..d21ce5d 100644 (file)
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@ -5,7 +5,6 @@
 
 {% block top_navigation %}
     <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
 
 {% block top_navigation %}
     <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>

-    <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>

     <li><a class="menu-wspolpraca" href="{% url "info" "wspolpraca/" %}">Współpraca</a></li>
     <li><a class="menu-szkolenia" href="{% url "info" "turniej/" %}">Turniej</a></li>
     <li><a class="menu-wesprzyj" href="{% url "info" "wesprzyj/" %}">Wesprzyj nas</a></li>
     <li><a class="menu-wspolpraca" href="{% url "info" "wspolpraca/" %}">Współpraca</a></li>
     <li><a class="menu-szkolenia" href="{% url "info" "turniej/" %}">Turniej</a></li>
     <li><a class="menu-wesprzyj" href="{% url "info" "wesprzyj/" %}">Wesprzyj nas</a></li>

diff --git a/edumed/urls.py b/edumed/urls.py
index ff55310..af3cb28 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -6,7 +6,6 @@ from .views import HomeView, AvatarlessProfileEditView
 
 urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),
 
 urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),

-    url(r'^kompetencje/', include('curriculum.urls')),

     url(r'^lekcje/', include('catalogue.urls')),
     url(r'^info/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
         name="info"),
     url(r'^lekcje/', include('catalogue.urls')),
     url(r'^info/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
         name="info"),

diff --git a/mil/templates/mil/base.html b/mil/templates/mil/base.html
index 41d0717..c7c9cfd 100644 (file)
--- a/mil/templates/mil/base.html
+++ b/mil/templates/mil/base.html
@@ -3,7 +3,7 @@
 
     {% block top_navigation %}
     <li><a class="menu-wspolpraca" href="">Konsultacje</a></li>
 
     {% block top_navigation %}
     <li><a class="menu-wspolpraca" href="">Konsultacje</a></li>

-        <li><a class="menu-kompetencje" href="">Kompetencje</a></li>
+        <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>

         <li><a class="menu-wspolpraca" href="">Weź udział</a></li>
         <li><a class="menu-lekcje" href="{% url 'home' subdomain=None %}">Materiały edukacyjne</a></li>
         <li><a class="menu-kontakt" href="">Kontakt</a></li>
         <li><a class="menu-wspolpraca" href="">Weź udział</a></li>
         <li><a class="menu-lekcje" href="{% url 'home' subdomain=None %}">Materiały edukacyjne</a></li>
         <li><a class="menu-kontakt" href="">Kontakt</a></li>

diff --git a/mil/urls.py b/mil/urls.py
index 4f765de..7f77523 100644 (file)
--- a/mil/urls.py
+++ b/mil/urls.py
@@ -4,4 +4,5 @@ from .views import root
 
 urlpatterns = patterns('',
     url(r'^$', root, name="root"),
 
 urlpatterns = patterns('',
     url(r'^$', root, name="root"),

+    url(r'^kompetencje/', include('curriculum.urls')),

 )
 )