Mercurial Mercurial > egonomy / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 6667fb5455d00baeb2b79e0b623a941edf2eddd2
authorcavaliet
Thu, 04 Jul 2013 15:57:08 +0200
changeset 221 c8531f9b4f6d
parent 220 c38fbfea55ac (diff)
parent 219 6667fb5455d0 (current diff)
child 222 07b1ff968e47
Merge with 6667fb5455d00baeb2b79e0b623a941edf2eddd2
--- a/integration/v2/css/style.css	Thu Jul 04 13:07:47 2013 +0200
+++ b/integration/v2/css/style.css	Thu Jul 04 15:57:08 2013 +0200
@@ -49,7 +49,7 @@
 .sub-nav{float: right; display: block;clear: both; }
 .sub-nav a{padding-bottom: 1px;font-size: 14px; font-family: 'Lato'; font-weight: 300; display:inline-block;}
 .sub-nav a:first-letter {text-transform: uppercase;}
-.sub-nav a.active, .sub-nav a:hover{border-bottom: 1px solid #000;}
+.sub-nav a.active, .sub-nav a:hover, .nav a:hover, .nav a.active{border-bottom: 1px solid #000;}
 .nav a{font-family: 'josefin_sans'; font-size: 18px; text-transform : uppercase;}
 .title-page{margin: 30px 0; position: relative; min-height: 30px;}
 h2{text-transform: uppercase; display:inline-block; font-size: 30px; font-family: 'Lato'; font-weight: 300;  }
--- a/src/egonomy/static/egonomy/css/style.css	Thu Jul 04 13:07:47 2013 +0200
+++ b/src/egonomy/static/egonomy/css/style.css	Thu Jul 04 15:57:08 2013 +0200
@@ -49,7 +49,7 @@
 .sub-nav{float: right; display: block;clear: both; }
 .sub-nav a{padding-bottom: 1px;font-size: 14px; font-family: 'Lato'; font-weight: 300; display:inline-block;}
 .sub-nav a:first-letter {text-transform: uppercase;}
-.sub-nav a.active, .sub-nav a:hover{border-bottom: 1px solid #000;}
+.sub-nav a.active, .sub-nav a:hover, .nav a:hover, .nav a.active{border-bottom: 1px solid #000;}
 .nav a{font-family: 'josefin_sans'; font-size: 18px; text-transform : uppercase;}
 .title-page{margin: 30px 0; position: relative; min-height: 30px;}
 h2{text-transform: uppercase; display:inline-block; font-size: 30px; font-family: 'Lato'; font-weight: 300;  }
--- a/src/egonomy/templates/egonomy_newbase.html	Thu Jul 04 13:07:47 2013 +0200
+++ b/src/egonomy/templates/egonomy_newbase.html	Thu Jul 04 15:57:08 2013 +0200
@@ -92,9 +92,9 @@
                 </ul>
                 <nav>
                     <ul class="nav clearfix">
-                        <li><a href="{% url 'all_pictures' %}">{% trans "explore" %}</a></li>
+                        <li><a href="{% url 'all_pictures' %}" {% if all_pictures %}class="active"{% endif %}>{% trans "explore" %}</a></li>
                         <li><span class="dot-10"></span></li>
-                        <li><a href="{% url 'all_collections' %}">{% trans "collect" %}</a></li>
+                        <li><a href="{% url 'all_collections' %}" {% if all_collections %}class="active"{% endif %}>{% trans "collect" %}</a></li>
                         <!--li><span class="dot-10"></span></li>
                         <li><a href="#">créer</a></li>
                         <li><span class="dot-10"></span></li>
--- a/src/egonomy/views.py	Thu Jul 04 13:07:47 2013 +0200
+++ b/src/egonomy/views.py	Thu Jul 04 15:57:08 2013 +0200
@@ -183,7 +183,7 @@
 
     return render_to_response("egonomy_all_pictures.html",
                               {'results':results, 'nb_pages':paginator.num_pages, 'cur_page_nb':cur_page_nb, "search":search, "nb_results":nb_results, 
-                               "url_pagination":url_pagination, "offset_search":offset_search,
+                               "url_pagination":url_pagination, "offset_search":offset_search, "all_pictures":True,
                                'current_user_collection_list':current_user_collection_list(request)},
                               context_instance=RequestContext(request))
 
@@ -259,7 +259,7 @@
 
     return render_to_response("egonomy_all_fragments.html",
                               {"search_fragment":True, 'results':results, 'nb_pages':paginator.num_pages, 'cur_page_nb':cur_page_nb, 
-                               "search":search, "nb_results":nb_results, "url_pagination":url_pagination, 
+                               "search":search, "nb_results":nb_results, "url_pagination":url_pagination,
                                "offset_search":offset_search, "offset_search":offset_search,
                                'current_user_collection_list':current_user_collection_list(request)},
                               context_instance=RequestContext(request))
@@ -479,7 +479,8 @@
     url_pagination = reverse("all_collections") + "?limit=" + str(nb)
 
     return render_to_response("egonomy_all_collections.html",
-                              {"user_collections":False, 'results':results, 'nb_pages':paginator.num_pages, 'cur_page_nb':cur_page_nb, "url_pagination":url_pagination},
+                              {"user_collections":False, 'results':results, 'nb_pages':paginator.num_pages, 'cur_page_nb':cur_page_nb,
+                               "url_pagination":url_pagination, 'all_collections':True},
                               context_instance=RequestContext(request))
egonomy