← Back to team overview

team4alfanous team mailing list archive

[Branch ~team4alfanous/alfanous/alfanous-git] Rev 528: Merge branch 'master' of github.com:01walid/alfanous

 

Merge authors:
  01walid (01walid)
------------------------------------------------------------
revno: 528 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Mon 2013-01-07 22:51:51 +0100
message:
  Merge branch 'master' of github.com:01walid/alfanous
modified:
  src/alfanous-django/templates/base.html
  src/alfanous-django/wui/static/css/screen.css


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription
=== modified file 'src/alfanous-django/templates/base.html'
--- src/alfanous-django/templates/base.html	2013-01-07 20:09:13 +0000
+++ src/alfanous-django/templates/base.html	2013-01-07 22:41:14 +0000
@@ -210,21 +210,30 @@
 <li class="menuitem"><span>{{ _("Ayahs") }}</span></li>
 {# <li class="menuitem"><a href="/sura/">{{ _("Surahs") }}</a></li> #}
 <li class="menuitem"><a href="{{ current_path }}word/">{{ _("Words") }}</a></li>
-<li class="menuitem"><a href="{{ current_path }}translation/">{{ _("Translations") }}</a></li>
+<!--
+	<li class="menuitem"><a href="{{ current_path }}translation/">{{ _("Translations") }}</a></li> 
+-->
 {# <li class="menuitem"><a href="/taffsir/">{{ _("Taffsirs") }}</a></li> #}
 {# <li class="menuitem"><a href="/hadith/">{{ _("Hadiths") }}</a></li> #}
 {# <li class="menuitem"><a href="/dream/">{{ _("Dreams") }}</a></li> #}
 {# <li class="menuitem"><a href="/poem/">{{ _("Poems") }}</a></li> #}
 
-</ul>
-<ul class="right">
-{% for language in available_languages %}
-<li class="menuitem" >
-{% ifequal language.0 language_code %}<span >{{ language.1 }}</span> 
-{% else %} <a href="/{{ language.0 }}/">{{ language.1 }}</a></span></li>
-{% endifequal %} 
-{% endfor %}
-</ul>
+<nav>
+	<ul class = "right">
+		<li class="menuitem"><a href="#">Translations &darr;</a>
+			<ul class = "right">
+				{% for language in available_languages %}
+				<li class="listItem" >
+					{% ifequal language.0 language_code %}<span >{{ language.1 }}</span> 
+					{% else %} <a href="/{{ language.0 }}/">{{ language.1 }}</a></span>
+				</li>
+				{% endifequal %} 
+				{% endfor %}
+			</ul>
+		</li>
+
+	</ul>
+</nav>
 <div style="clear: left"></div>
 </div>
 <!-- End Alfanous Header -->

=== modified file 'src/alfanous-django/wui/static/css/screen.css'
--- src/alfanous-django/wui/static/css/screen.css	2013-01-06 15:10:08 +0000
+++ src/alfanous-django/wui/static/css/screen.css	2013-01-07 22:43:27 +0000
@@ -963,7 +963,54 @@
 text-decoration: none; 
 }
 
-
-
-
-
+nav {
+	text-align: center;
+}
+
+nav ul ul {
+	display: none;
+}
+
+nav ul li:hover > ul {
+	display: block;
+}
+
+nav ul:after {
+	content: "";
+	clear: both;
+	display: block;
+}
+
+nav ul li {
+	float: left;
+}
+
+nav ul li a {
+	display: block;
+	color: #757575;
+	text-decoration: none;
+}
+			
+		
+nav ul ul {
+	background: rgb(34, 34, 34);;
+	padding: 0;
+	position: absolute;
+	top: 100%;
+}
+
+nav ul ul li {
+	float: none; 
+	position: relative;
+}
+
+nav ul ul li a {
+	padding: 15px 40px;
+	color: #fff;
+}	
+		
+nav ul ul ul {
+	position: absolute;
+	left: 100%; top:0;
+}
+