EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into campaign_close

pull/1/head
Raymond Yee 2012-11-15 09:12:26 -08:00
parent b2ca44da31 5eb8475ff0
commit 202f1700ea
6 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/templates/base.html
View File

@ -40,9 +40,14 @@
<script>
var $j = jQuery.noConflict();
$j(document).ready(function(){
// make drop-down menu happen when they click on their name
$j('#authenticated').click(function(){
$j('#user_menu').toggle();
$j(this).toggleClass("highlight");
$j(this).toggleClass('highlight');
});
// but suppress it if they're clicking on the badge link to the notifications page
$j('#i_haz_notifications_badge').click(function() {
event.stopPropagation();
});
});
</script>
@ -109,7 +114,7 @@
<img class="user-avatar" src="/static/images/header/avatar.png" height="36" width="36" alt="Generic Ungluer Avatar" title="Ungluer" />
{% endif %}
{% if unseen_count %}
<span id="i_haz_notifications_badge">{{ unseen_count }}</span>
<a href="/notification"><span id="i_haz_notifications_badge">{{ unseen_count }}</span></a>
{% endif %}
</li>
{% comment %}

35
static/css/sitewide.css
View File

@ -637,7 +637,7 @@ ul.menu {
position: relative;
}
.js-topmenu#authenticated.highlight span#welcome {
background-image: url("/static/images/menu_bar_up_arrow.png");
background-image: url("/static/images/menu_bar_up_arrow_textblue.png");
}
.js-topmenu ul#user_menu {
display: none;
@ -687,7 +687,6 @@ ul.menu {
letter-spacing: -0.05em;
}
.js-topmenu ul li span#welcome {
color: #8dc63f;
height: 36px;
line-height: 36px;
display: block;
@ -703,7 +702,7 @@ ul.menu {
padding: 0 10px;
margin-right: 5px;
padding-right: 22px;
background-image: url("/static/images/menu_bar_down_arrow.png");
background-image: url("/static/images/menu_bar_down_arrow_textblue.png");
background-repeat: no-repeat;
background-position: right;
}
@ -735,12 +734,12 @@ ul.menu {
}
.js-topmenu ul .unseen_count {
border: solid 2px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-border-radius: 700px;
-webkit-border-radius: 700px;
border-radius: 700px;
-moz-border-radius: 700px;
-webkit-border-radius: 700px;
border-radius: 700px;
padding: 3px;
line-height: 16px;
width: 16px;
@ -751,7 +750,7 @@ ul.menu {
.js-topmenu ul .unseen_count#i_haz_notifications {
background-color: #8dc63f;
color: white;
border-color: #8dc63f;
border-color: white;
}
.js-topmenu ul .unseen_count#no_notifications_for_you {
border-color: #edf3f4;
@ -759,12 +758,12 @@ ul.menu {
color: #3d4e53;
}
#i_haz_notifications_badge {
-moz-border-radius: 18px;
-webkit-border-radius: 18px;
border-radius: 18px;
-moz-border-radius: 18px;
-webkit-border-radius: 18px;
border-radius: 18px;
-moz-border-radius: 700px;
-webkit-border-radius: 700px;
border-radius: 700px;
-moz-border-radius: 700px;
-webkit-border-radius: 700px;
border-radius: 700px;
font-size: 13px;
border: solid 2px white;
margin-left: -7px;
@ -773,6 +772,7 @@ ul.menu {
background: #8dc63f;
color: white;
position: absolute;
line-height: normal;
}
.js-search {
float: left;
@ -818,9 +818,6 @@ ul.menu {
.js-search-inner {
float: right;
}
#welcome {
overflow: hidden;
}
#locationhash {
/* used solely to contain template variables for tabs.js; should not display */

BIN
static/images/menu_bar_down_arrow_textblue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
static/images/menu_bar_up_arrow_textblue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

16
static/less/sitewide.less
View File

@ -286,7 +286,7 @@ ul.menu{
}
&#authenticated.highlight span#welcome {
background-image: url("/static/images/menu_bar_up_arrow.png");
background-image: url("/static/images/menu_bar_up_arrow_textblue.png");
}
ul {
@ -333,7 +333,6 @@ ul.menu{
}
span#welcome {
color:@green;
.header-text;
padding: 0 10px;
margin-right: 5px;
@ -343,7 +342,7 @@ ul.menu{
vertical-align: middle;
}
background-image: url("/static/images/menu_bar_down_arrow.png");
background-image: url("/static/images/menu_bar_down_arrow_textblue.png");
background-repeat: no-repeat;
background-position: right;
}
@ -373,7 +372,7 @@ ul.menu{
.unseen_count {
border: solid 2px;
.one-border-radius(5px);
.one-border-radius(700px);
padding: 3px;
line-height: 16px;
width: 16px;
@ -384,7 +383,7 @@ ul.menu{
&#i_haz_notifications {
background-color: @call-to-action;
color: white;
border-color: @call-to-action;
border-color: white;
}
&#no_notifications_for_you {
@ -397,7 +396,7 @@ ul.menu{
}
#i_haz_notifications_badge {
.one-border-radius(18px);
.one-border-radius(700px);
font-size: @font-size-default;
border: solid 2px white;
margin-left: -7px;
@ -406,6 +405,7 @@ ul.menu{
background: @call-to-action;
color: white;
position: absolute;
line-height: normal;
}
.js-search {
@ -451,10 +451,6 @@ ul.menu{
float:right;
}
#welcome {
overflow: hidden;
}
#locationhash {
/* used solely to contain template variables for tabs.js; should not display */
display: none;

2
test/campaigntest.py
View File

@ -189,7 +189,7 @@ def test_relaunch(unglue_it_url = settings.LIVE_SERVER_TEST_URL, do_local=True,
input_username = WebDriverWait(sel,20).until(lambda d : d.find_element_by_css_selector("input#id_username"))
input_username.send_keys(USER)
sel.find_element_by_css_selector("input#id_password").send_keys(PASSWORD)
sel.find_element_by_css_selector("input[value*='sign in']").click()
sel.find_element_by_css_selector("input[value*='Sign In']").click()
# click on biggest campaign list
# I have no idea why selenium thinks a is not displayed....so that's why I'm going up one element.