del link to create/edit profile, add dropdown navbar

Kurmaev · May 23, 2012 · d4e01b4 · d4e01b4
1 parent cc24989
commit d4e01b4
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 21 deletions.
diff --git a/firstsite/static/datepicker/scripts/jquery.min.js b/firstsite/static/datepicker/scripts/jquery.min.js
diff --git a/firstsite/static/js/bootstrap.min.js b/firstsite/static/js/bootstrap.min.js
diff --git a/firstsite/views.py b/firstsite/views.py
@@ -4,6 +4,9 @@
 
 def randpage(request):
     today = datetime.date.today()
+### Delete after show!!!!
+    from django.core.cache import cache
+    cache.clear()
     list_events = Event.objects.raw('select * from event_event where date_end>=\
 "%s" order by rand() LIMIT 5'% (today.isoformat()))
 

diff --git a/template/main/add_event.html b/template/main/add_event.html
@@ -2,21 +2,26 @@
 
 {% block styles %}
 <link rel="stylesheet" type="text/css" media="screen" href="{{ STATIC_URL }}datepicker/styles/datePicker.css">
+<link rel="stylesheet" type="text/css" media="screen" href="{{ STATIC_URL }}wysiwyg/jquery.wysiwyg.css">
 {% endblock %}
 
 {% block scripts %}
-<script type="text/javascript" src="{{ STATIC_URL }}datepicker/scripts/jquery.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}datepicker/scripts/date.js"></script>
 <!--[if IE]><script type="text/javascript" src="{{ STATIC_URL }}datepicker/scripts/jquery.bgiframe.min.js"></script><![endif]-->
 <script type="text/javascript" src="{{ STATIC_URL }}datepicker/scripts/jquery.datePicker.js"></script>
-
+<script type="text/javascript" src="{{ STATIC_URL }}wysiwyg/jquery.wysiwyg.js"></script>
 <script type="text/javascript" charset="utf-8">
     $(function()
     {
         $('.date-pick').datePicker()
     });
 </script>
 
+<script type="text/javascript">
+$(function() {
+    $('#id_text').wysiwyg();
+});
+</script>
 {% endblock %}
 
 {% block content %}

diff --git a/template/main/base.html b/template/main/base.html
@@ -10,6 +10,9 @@
     {% block styles %}{% endblock %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/main.css">
+    <script type="text/javascript" src="{{ STATIC_URL }}datepicker/scripts/jquery.min.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
+
     {% block scripts %}{% endblock %}
   </head>
 {% endcache %}
@@ -25,8 +28,6 @@
             <li{% path_match "active" "view_next_day" %}><a href="{% url view_next_day %}">Завтра</a></li>
             <li{% path_match "active" "view_next_week" %}><a href="{% url view_next_week %}">На неделю</a></li>
             <li{% path_match "active" "randpage" %}><a href="{% url randpage %}">Мне повезет!</a></li>
-            <li{% path_match "active" "profiles_create_profile" %}><a href="{% url profiles_create_profile %}">profiles_create_profile</a></li>
-            <li{% path_match "active" "profiles_edit_profile" %}><a href="{% url profiles_edit_profile %}">profiles_edit_profile</a></li>
 
             {% if user.is_authenticated %}
             <li{% path_match "active" "add_event" %}>
@@ -42,7 +43,16 @@
           <ul class="nav pull-right">
             <li class="divider-vertical"></li>
             {% if user.is_authenticated %}
-            <li><a href="{% url user_logout %}">Logout</a></li>
+            <ul class="nav">
+            <li class="dropdown">
+              <a data-toggle="dropdown" class="dropdown-toggle" href="#">Привет, {{ user }}! <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href={% url profiles_edit_profile %}>Редактировать профиль</a></li>
+                <li class="divider"></li>
+                <li><a href="{% url user_logout %}">Logout</a></li>
+              </ul>
+            </li>
+              </ul>
             {% else %}
             <li{% path_match "active" "user_login" %}><a href="{% url user_login %}">Login</a></li>
             {% endif %}