You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/05/01 02:25:43 UTC
[6/6] git commit: [#5599] ticket:296 fixed css
[#5599] ticket:296 fixed css
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4ed2aa7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4ed2aa7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4ed2aa7d
Branch: refs/heads/cj/5599
Commit: 4ed2aa7d14e5142b1e6aa922fbc283b2cbfa2047
Parents: d11d320
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Thu Apr 18 16:56:03 2013 +0400
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Apr 30 23:28:34 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/project.py | 2 +-
Allura/allura/nf/allura/css/site_style.css | 9 ++++++---
Allura/allura/templates/jinja_master/top_nav.html | 14 +++++++++-----
Allura/allura/tests/functional/test_admin.py | 2 +-
Allura/allura/tests/functional/test_home.py | 2 +-
5 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2aa7d/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 73894e3..8a06566 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -511,7 +511,7 @@ class Project(MappedClass, ActivityNode, ActivityObject):
grouped_nav[tool_name].children.append(e)
elif len(grouped_nav[tool_name].children) == 10:
e.url = self.url() + '_list/' + tool_name
- e.label = '...more...'
+ e.label = 'More...'
grouped_nav[tool_name].children.append(e)
return grouped_nav.values()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2aa7d/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 98938e8..06b93ca 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -994,7 +994,6 @@ a.btn:active {
text-align: center;
position: relative;
margin: 0 0 20px;
- height: 50px;
}
.btn-bar.pop, .pop#top_nav {
height: 150px;
@@ -2123,8 +2122,8 @@ nav .ico {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.9);
border: medium none;
margin: 0 0 20px 0;
- display: block;
overflow: visible;
+ width: 940px;
}
#top_nav a {
float: left;
@@ -2923,6 +2922,9 @@ ul.dropdown ul {
background-color: #ffffff;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
+ -o-border-radius: 5px;
+ -ms-border-radius: 5px;
+ -khtml-border-radius: 5px;
border-radius: 5px;
border-width: 1px;
border-style: solid;
@@ -2942,6 +2944,7 @@ ul.dropdown ul li a {
height: 20px !important;
font-weight:normal;
}
-li.selected {
+li.selected,
+ul.dropdown ul li.selected a{
font-weight:bold;
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2aa7d/Allura/allura/templates/jinja_master/top_nav.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/top_nav.html b/Allura/allura/templates/jinja_master/top_nav.html
index aeec126..47ef332 100644
--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -36,11 +36,15 @@
</a>
{% set grouped_tool_count = s.matching_urls|length %}
{% if grouped_tool_count %}
- <ul>
- {%for tool in s.children%}
- <li><span><a href="{{tool.url}}">{{tool.label}}</a></span></li>
- {%endfor%}
- </ul>
+ <ul>
+ {%for tool in s.children%}
+ {% set selected = False %}
+ {% if tool.matches_url(request) or c.project.neighborhood.url()+'_admin' in request.upath_info%}
+ {% set selected = True %}
+ {% endif %}
+ <li class="{% if selected %}selected{% endif %}"><a href="{{tool.url}}">{{tool.label}}</a></li>
+ {%endfor%}
+ </ul>
{% endif %}
</li>
{% endfor %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2aa7d/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 1752707..3197386 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -119,7 +119,7 @@ class TestProjectAdmin(TestController):
# check the nav - tools of same type are grouped
r = self.app.get('/p/test/test-tool/Home/')
active_link = r.html.findAll('li',{'class':'selected'})
- assert len(active_link) == 1
+ assert len(active_link) == 2
assert active_link[0].contents[1]['href'] == '/p/test/_list/wiki'
assert r.html.findAll('a', {'href':'/p/test/test-tool2/'})
assert r.html.findAll('a', {'href':'/p/test/test-tool/'})
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2aa7d/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index 4904394..3e11437 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -65,7 +65,7 @@ class TestProjectHome(TestController):
response = self.app.get('/p/test/_nav.json')
menu = response.json['menu']
assert_equal(len(menu[1]['children']), 11)
- assert {u'url': u'/p/test/_list/wiki', u'name': u'...more...', u'icon': u'tool-wiki'} in menu[1]['children']
+ assert {u'url': u'/p/test/_list/wiki', u'name': u'More...', u'icon': u'tool-wiki'} in menu[1]['children']
@td.with_wiki
def test_neighborhood_home(self):