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

Merge pull request #75 from Gluejar/fix_nav_menu 

Fix nav menu. If we improve the arrow button, this is good to go
pull/1/head
eshellman 2012-11-06 13:03:33 -08:00
parent 2ff9d4a4d3 304ddb6bdc
commit e401ad7b99
23 changed files with 105 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/templates/base.html
View File

@ -85,7 +85,7 @@
<div class="js-topmenu" id="authenticated">
<ul class="menu">
<li>
<a href="#"><span id="welcome">Hi, {{ user.username }} {% if unseen_count %}<img src="/static/images/menu_bar_down_arrow.png">{% endif %}</span></a>
<a href="#"><span id="welcome">Hi, {{ user.username }}</span></a>
</li>
<ul id="user_menu">
<li><a href="{% url supporter supporter_username=user.username %}">Wishlist</a></li>
@ -103,11 +103,14 @@
<li><a href="{% url auth_logout %}"><span>Sign Out</span></a></li>
</ul>
<li>
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ supporter.profile.pic_url }}" height=36 width="36" alt="Picture of {{ supporter }}" title="{{ supporter }}" />
{% if user.profile.pic_url %}
<img class="user-avatar" src="{{ user.profile.pic_url }}" height=36 width="36" alt="Picture of {{ user.username }}" title="{{ user.username }}" />
{% else %}
<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>
{% endif %}
</li>
{% comment %}
@ -118,7 +121,12 @@
<div class="js-topmenu">
<ul class="menu">
<li><a href="{% url auth_login %}?next={% firstof request.path '/' %}"><span>Sign In</span></a></li>
<li id="expander" class="last"><a href="{% url registration_register %}"><span>sign up</span></a></li>
{% if not suppress_search_box %}
{% comment %}
don't display this on landing page where it's superseded by big signup box in splash area
{% endcomment %}
<li id="expander" class="last"><a href="{% url registration_register %}"><span>Sign Up</span></a></li>
{% endif %}
</ul>
</div>
{% endif %}

2
frontend/templates/home.html
View File

@ -64,7 +64,7 @@
<input id="id_password2_pop" type="password" class="required" name="password2" size="30" />
</div>
<div class="button">
<input type="submit" class="signup" value="sign up" />
<input type="submit" class="signup" value="Sign Up" />
</div>
</form>
<div class="google_signup">

2
frontend/templates/registration/login_form.html
View File

@ -4,7 +4,7 @@
{{ form.username }}
{{ form.password.label_tag }}
{{ form.password }}
<input type="submit" value="sign in" />
<input type="submit" value="Sign In" />
<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
</form>

53
frontend/templates/work.html
View File

@ -444,32 +444,32 @@ $j(document).ready(function(){
<div class="jsmod-content">
<ul class="support menu">
{% if pledged %}
{% with pledged.0.amount as amount %}
<li class="first">
<a href="{% url pledge_modify work_id %}?preapproval_amount=1">
<span class="menu-item-price">Any amount</span>{% if amount < 25 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">The unglued ebook, free for you to read and share.</span>
</a>
</li>
<li>
<a href="{% url pledge_modify work_id %}?preapproval_amount=25">
<span class="menu-item-price">$25 and up</span>{% if amount >= 25 and amount < 50 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">Your name in the acknowledgements section under "Supporters".</span>
</a>
</li>
<li>
<a href="{% url pledge_modify work_id %}?preapproval_amount=50">
<span class="menu-item-price">$50 and up</span>{% if amount >= 50 and amount < 100 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">Your name &amp; profile link in the acknowledgements section under "Benefactors".</span>
</a>
</li>
<li class="last">
<a href="{% url pledge_modify work_id %}?preapproval_amount=100">
<span class="menu-item-price">$100 and up</span>{% if amount >= 100 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">Your name, profile link, &amp; a dedication of your choice in the acknowledgements section under "Bibliophiles".</span>
</a>
</li>
{% endwith %}
{% with pledged.0.amount as amount %}
<li class="first">
<a href="{% url pledge_modify work_id %}?preapproval_amount=1">
<span class="menu-item-price">Any amount</span>{% if amount < 25 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">The unglued ebook, free for you to read and share.</span>
</a>
</li>
<li>
<a href="{% url pledge_modify work_id %}?preapproval_amount=25">
<span class="menu-item-price">$25 and up</span>{% if amount >= 25 and amount < 50 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">Your name in the acknowledgements section under "Supporters".</span>
</a>
</li>
<li>
<a href="{% url pledge_modify work_id %}?preapproval_amount=50">
<span class="menu-item-price">$50 and up</span>{% if amount >= 50 and amount < 100 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">Your name &amp; profile link in the acknowledgements section under "Benefactors".</span>
</a>
</li>
<li class="last">
<a href="{% url pledge_modify work_id %}?preapproval_amount=100">
<span class="menu-item-price">$100 and up</span>{% if amount >= 100 %}<div class="you_pledged">Yours!</div>{% endif %}
<span class="menu-item-desc">Your name, profile link, &amp; a dedication of your choice in the acknowledgements section under "Bibliophiles".</span>
</a>
</li>
{% endwith %}
{% else %}
<li class="first">
<a href="{% url pledge work_id %}?preapproval_amount=1">
@ -499,7 +499,6 @@ $j(document).ready(function(){
</ul>
</div>
</div>
{% endif %}
</div>
</div>

1
static/css/book_list.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/book_panel.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/campaign.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/comments.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

2
static/css/documentation.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
@ -113,7 +112,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/download.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

2
static/css/landingpage.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
@ -113,7 +112,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/learnmore.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/manage_campaign.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/notices.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/pledge.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/registration.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

1
static/css/search.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

42
static/css/sitewide.css
View File

@ -6,7 +6,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
@ -114,7 +113,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
@ -432,7 +430,7 @@ body {
}
a {
font-weight: bold;
font-size: 13px;
font-size: inherit;
text-decoration: none;
cursor: pointer;
color: #6994a3;
@ -455,6 +453,16 @@ h4 {
img {
border: none;
}
img.user-avatar {
float: left;
margin-right: 10px;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
}
input,
textarea,
a.fakeinput {
@ -611,6 +619,7 @@ ul.menu {
.js-topmenu {
float: right;
margin-top: 25px;
font-size: 15px;
}
.js-topmenu#authenticated {
-moz-border-radius: 5px;
@ -627,6 +636,9 @@ ul.menu {
cursor: pointer;
position: relative;
}
.js-topmenu#authenticated.highlight span#welcome {
background-image: url("/static/images/menu_bar_up_arrow.png");
}
.js-topmenu ul#user_menu {
display: none;
z-index: 100;
@ -666,14 +678,12 @@ ul.menu {
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.js-topmenu ul li span#welcome {
@ -683,17 +693,19 @@ ul.menu {
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
padding: 0 10px;
margin-right: 5px;
padding-right: 22px;
background-image: url("/static/images/menu_bar_down_arrow.png");
background-repeat: no-repeat;
background-position: right;
}
.js-topmenu ul li span#welcome img {
vertical-align: middle;
@ -746,6 +758,22 @@ ul.menu {
background-color: #edf3f4;
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;
font-size: 13px;
border: solid 2px white;
margin-left: -7px;
margin-top: -10px;
padding: 3px;
background: #8dc63f;
color: white;
position: absolute;
}
.js-search {
float: left;
padding-top: 25px;

8
static/css/supporter_layout.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
@ -189,13 +188,6 @@
.user-block4 {
margin-top: 7px;
}
img.user-avatar {
float: left;
margin-right: 10px;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
}
.user-badges {
position: absolute;
bottom: 0;

1
static/css/variables.css
View File

@ -5,7 +5,6 @@
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {

32
static/less/sitewide.less
View File

@ -111,7 +111,7 @@ body{
a {
font-weight:bold;
font-size: @font-size-default;
font-size: inherit;
text-decoration:none;
cursor:pointer;
@ -142,6 +142,12 @@ img {
border:none;
}
img.user-avatar {
float:left;
margin-right:10px;
.one-border-radius(7px);
}
input, textarea, a.fakeinput {
border: 2px solid @blue-grey;
.one-border-radius(5px);
@ -266,6 +272,7 @@ ul.menu{
.js-topmenu {
float:right;
margin-top:25px;
font-size: @font-size-larger;
&#authenticated {
.one-border-radius(5px);
@ -278,6 +285,10 @@ ul.menu{
position: relative;
}
&#authenticated.highlight span#welcome {
background-image: url("/static/images/menu_bar_up_arrow.png");
}
ul {
&#user_menu {
display: none;
@ -325,11 +336,16 @@ ul.menu{
color:@green;
.header-text;
padding: 0 10px;
margin-right: 5px;
margin-right: 5px;
padding-right: 22px;
img {
vertical-align: middle;
}
background-image: url("/static/images/menu_bar_down_arrow.png");
background-repeat: no-repeat;
background-position: right;
}
img {
@ -380,6 +396,18 @@ ul.menu{
}
}
#i_haz_notifications_badge {
.one-border-radius(18px);
font-size: @font-size-default;
border: solid 2px white;
margin-left: -7px;
margin-top: -10px;
padding: 3px;
background: @call-to-action;
color: white;
position: absolute;
}
.js-search {
float:left;
padding-top:25px;

6
static/less/supporter_layout.less
View File

@ -116,12 +116,6 @@
margin-top: 7px;
}
img.user-avatar {
float:left;
margin-right:10px;
.one-border-radius(7px);
}
.user-badges {
position: absolute;
bottom: 0;

1
static/less/variables.less
View File

@ -27,7 +27,6 @@
display:block;
text-decoration:none;
font-weight:bold;
font-size:13px;
letter-spacing: -.05em;
}