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

Remove old menu, add links to new menu, fix avatar

foundation/fix-avatar
nicholas antonov 2018-05-16 15:51:41 -04:00
parent 4ba506960a
commit 01f4fb43ec
10 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
frontend/templates/base.html
View File

@ -64,38 +64,8 @@
</div>
<div id="header-login">
{% block signin %}
{% if user.is_authenticated %}
<div class="js-topmenu" id="authenticated">
<ul class="menu">
<li>
<a class="notbutton" href="#"><span id="welcome">Hi, {{ user.username }} <i class="fa fa-chevron-down"> </i></span></a>
</li>
<li>{% block avatar %}
<img class="user-avatar" src="{{ user.profile.avatar_url }}" height=36 width="36" alt="Avatar for {{ user.username }}" title="{{ user.username }}" />{% endblock %}
{% if unseen_count %}
<a href="/notification"><span id="i_haz_notifications_badge">{{ unseen_count }}</span></a>
{% endif %}
</li>
</ul>
<ul id="user_menu">
<li><a class="notbutton" href="{% url 'supporter' user %}">My Faves</a></li>
<li>
<a class="notbutton" href="/notification"><span>Notices</span>
{% if unseen_count %}
<span id="i_haz_notifications" class="unseen_count">{{ unseen_count }}</span>
{% else %}
<span id="no_notifications_for_you" class="unseen_count">0</span>
{% endif %}
</a>
</li>
<li><a class="notbutton" href="{% url 'supporter' user %}#edit" id="profile_edit"><span>Profile Settings</span></a></li>
<li><a class="notbutton" href="{% url 'manage_account' %}"><span>Account &amp; Pledges</span></a></li>
{% if user.rights_holder.all %}
<li><a class="notbutton" href="{% url 'rightsholders' %}">Rights Holder Tools</a></li>
{% endif %}
<li><a class="notbutton" href="{% url 'auth_logout' %}"><span>Sign Out</span></a></li>
</ul>
</div>
{% if True or user.is_authenticated %}
<img class="user-avatar" src="{{ user.profile.avatar_url }}" height=36 width="36" alt="Avatar for {{ user.username }}" title="{{ user.username }}" />
{% else %}
<a class="notbutton hijax" href="{% url 'superlogin' %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}"><span>Log In</span></a>
<a class="button success" href="{% url 'registration_register' %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}">Sign Up</a>
@ -111,15 +81,28 @@
<label for="menu-drilldown-box">
<li toggle-header-menu><a href="#">Back</a></li>
</label>
{% if user.is_authenticated %}
<li>
<a href="#">Account</a>
<ul class="menu vertical nested">
<li><a href="#">Pledges</a></li>
<li><a href="#">Notices</a></li>
<li><a href="#">Profile Settings</a></li>
<li><a href="#">Sign out</a></li>
<li><a href="/notification">Notices</a>
<a class="notbutton" href="/notification"><span>Notices: </span>
{% if unseen_count %}
<span id="i_haz_notifications" class="unseen_count">{{ unseen_count }}</span>
{% else %}
<span id="no_notifications_for_you" class="unseen_count">0</span>
{% endif %}
</a>
</li>
<li><a href="{% url 'supporter' user %}">My Faves</a></li>
<li><a href="{% url 'manage_account' %}">Profile Settings</a></li>
{% if user.rights_holder.all %}
<li><a class="notbutton" href="{% url 'rightsholders' %}">Rights Holder Tools</a></li>
{% endif %}
<li><a href="{% url 'auth_logout' %}">Sign out</a></li>
</ul>
</li>
{% endif %}
<li>
<a href="#">About Unglue.it</a>
<ul class="menu vertical nested">

4
static/scss/book_panel2.css
View File

File diff suppressed because one or more lines are too long

2
static/scss/documentation2.css
View File

File diff suppressed because one or more lines are too long

2
static/scss/global.css
View File

File diff suppressed because one or more lines are too long

2
static/scss/header.css
View File

@ -1,3 +1,3 @@
.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}#page-wrapper{display:flex;flex-direction:column;width:100%}#header{width:100%;display:flex;flex-flow:wrap;align-items:flex-start;padding:10px}#header-logo{flex:1 0 auto;order:1;align-self:flex-start}#header-logo img{max-height:48px}#header-search-bar{margin-top:auto;margin-bottom:auto;padding-left:8px;padding-right:8px;flex:100%;order:5}#header-search-bar form{width:100%;max-width:800px;margin-right:auto;margin-left:auto;display:flex;align-items:flex-start;background:#1779ba;border-right:2px solid #1779ba;border-radius:0 6px 6px 0}#header-search-bar form i{align-self:flex-start;font-size:1.5em;margin-top:auto;margin-bottom:auto;color:white;padding:4px;background:#1779ba}#header-search-bar form input{align-self:flex-start;margin-top:auto;margin-bottom:auto}#header-login{flex:1 1 auto;display:flex;margin-top:auto;margin-bottom:auto;padding-left:8px;padding-right:8px;order:3;white-space:nowrap;align-items:center}#header-login .button{margin:0;margin-left:10px}#header-menu{flex:1;margin-top:auto;margin-bottom:auto;padding-left:8px;order:4}#header-menu i{font-size:3em;margin-top:auto;margin-bottom:auto}.wrapper{max-width:1000px;padding-top:24px}#footer{width:100%}@media print, screen and (min-width: 40em){#header{flex-flow:nowrap}#header-search-bar{order:2}}@media screen and (max-width: 21.75em){#header-login{display:none}}
/*# sourceMappingURL=../../../../../../../static/scss/header.css.map */
/*# sourceMappingURL=../../../../../../static/scss/header.css.map */

4
static/scss/home.css
View File

@ -1,3 +1,3 @@
.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.user-block{width:100%;clear:both}#user-block1{width:100%}#user-block1 a#readon{float:left}.user-block-hide .quicktour.last{background:none}.learnmore_block{float:left;width:100%;clear:both;border-top:solid 1px #8ac3d7;margin-top:20px}.learnmore_block .learnmore_row{border-bottom:dashed 2px #8ac3d7;clear:left;width:68%}.learnmore_block .arrow{font-size:24pt;color:#8ac3d7;line-height:48pt;float:left;padding-right:8px;padding-left:8px;padding-top:20px;font-size:24pt}.learnmore_block .quicktour{width:20%;float:left;font-style:italic;line-height:20px;font-size:13px;margin-top:0;text-align:center;min-height:64px}.learnmore_block .quicktour .highlight{font-weight:bold}.learnmore_block .quicktour .programlink{margin-top:20px}.learnmore_block .quicktour .panelback{margin-top:21px}.learnmore_block .quicktour .panelfront{font-size:48pt;line-height:48pt;font-style:normal}.learnmore_block .quicktour .panelfront .makeaskgive{position:relative;z-index:1;font-size:40pt;top:10px;right:10pt;text-shadow:4px 2px 4px white}.learnmore_block .quicktour .panelfront .qtbutton{position:relative;z-index:0;opacity:0.8}.learnmore_block .quicktour .panelfront .make{line-height:10pt;color:red;font-size:12pt;top:0;left:50px}.learnmore_block .quicktour .panelfront .qtreadit{line-height:0;position:relative;height:34px}.learnmore_block .quicktour .panelfront .qtreadittext{top:-15px;left:50px;line-height:10pt}.learnmore_block .quicktour .panelfront input{line-height:10pt;display:inherit;font-size:10pt;padding:.7em 1em;top:-15px}.learnmore_block .quicktour.last{padding-left:10px;font-size:20px;width:28%;padding-top:20px}.learnmore_block .quicktour.last .signup{color:#8dc63f;font-weight:bold;margin-top:10px}.learnmore_block .quicktour.last .signup img{margin-left:5px;vertical-align:middle;margin-bottom:3px}.learnmore_block .quicktour.right{float:right}input[type="submit"].qtbutton{float:none;margin:0}#block-intro-text div{display:none;line-height:25px;padding-bottom:10px}#block-intro-text div#active{display:inherit}.featured_books{margin-top:18px;font-size:19px}.module-title{font-size:19px}.js-main-container{margin-left:auto;margin-right:auto;max-width:960px}#user-block1 #block-intro-text{float:left;width:702px;font-size:19px}#user-block1 a#readon{font-size:15px}@media screen and (max-width: 39.9375em){#js-maincol-fl{display:flex;flex-direction:column}#js-topsection{visibility:hidden;height:0px}.more_featured_books{display:none}.more_featured_books_mobile{width:100%}.more_featured_books_mobile>a{width:100%}}@media screen and (min-width: 40em){#js-maincol-fl{display:flex}#js-maincol-fl #js-main-continer{flex:1 84%}#js-maincol-fl #js-rightcol{flex:1 16%}.more_featured_books{padding-left:14px}.more_featured_books>i{margin-top:150px;font-size:26px}.more_featured_books_mobile{display:none !important}}#js-main-container{display:flex;flex-direction:column}#js-rightcol .js-rightcol-padd{background-color:#edf3f4;padding:10px}.jsmodule{margin-bottom:14px}.jsmodule .google_signup a{width:100%;border-radius:0px;border:none}.sidebar_button{margin-bottom:10px}.sidebar_button input{background-color:#8dc63f;color:white;width:100%;padding:12px;border:none}.book-description{overflow:auto}.book-detail{display:flex}.book_container{display:flex;overflow-x:scroll;box-sizing:content-box}.book_container .thewholebook{border:none}.book_container::-webkit-scrollbar{display:none}
.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.user-block{width:100%;clear:both}#user-block1{width:100%}#user-block1 a#readon{float:left}.user-block-hide .quicktour.last{background:none}.learnmore_block{float:left;width:100%;clear:both;border-top:solid 1px #8ac3d7;margin-top:20px}.learnmore_block .learnmore_row{border-bottom:dashed 2px #8ac3d7;clear:left;width:68%}.learnmore_block .arrow{font-size:24pt;color:#8ac3d7;line-height:48pt;float:left;padding-right:8px;padding-left:8px;padding-top:20px;font-size:24pt}.learnmore_block .quicktour{width:20%;float:left;font-style:italic;line-height:20px;font-size:13px;margin-top:0;text-align:center;min-height:64px}.learnmore_block .quicktour .highlight{font-weight:bold}.learnmore_block .quicktour .programlink{margin-top:20px}.learnmore_block .quicktour .panelback{margin-top:21px}.learnmore_block .quicktour .panelfront{font-size:48pt;line-height:48pt;font-style:normal}.learnmore_block .quicktour .panelfront .makeaskgive{position:relative;z-index:1;font-size:40pt;top:10px;right:10pt;text-shadow:4px 2px 4px white}.learnmore_block .quicktour .panelfront .qtbutton{position:relative;z-index:0;opacity:0.8}.learnmore_block .quicktour .panelfront .make{line-height:10pt;color:red;font-size:12pt;top:0;left:50px}.learnmore_block .quicktour .panelfront .qtreadit{line-height:0;position:relative;height:34px}.learnmore_block .quicktour .panelfront .qtreadittext{top:-15px;left:50px;line-height:10pt}.learnmore_block .quicktour .panelfront input{line-height:10pt;display:inherit;font-size:10pt;padding:.7em 1em;top:-15px}.learnmore_block .quicktour.last{padding-left:10px;font-size:20px;width:28%;padding-top:20px}.learnmore_block .quicktour.last .signup{color:#8dc63f;font-weight:bold;margin-top:10px}.learnmore_block .quicktour.last .signup img{margin-left:5px;vertical-align:middle;margin-bottom:3px}.learnmore_block .quicktour.right{float:right}input[type="submit"].qtbutton{float:none;margin:0}#block-intro-text div{display:none;line-height:25px;padding-bottom:10px}#block-intro-text div#active{display:inherit}.featured_books{margin-top:18px;font-size:19px}.module-title{font-size:19px}.js-main-container{margin-left:auto;margin-right:auto;max-width:960px}#user-block1 #block-intro-text{float:left;width:702px;font-size:19px}#user-block1 #readon{font-size:15px}.jsmodule{background-color:#edf3f4;padding:10px}.jsmodule .google_signup a{width:100%;border-radius:0px;border:none}@media screen and (max-width: 39.9375em){#js-maincol-fl{display:flex;flex-direction:column}#js-topsection{visibility:hidden;height:0px}.more_featured_books{display:none}.more_featured_books_mobile{width:100%}.more_featured_books_mobile>a{width:100%}.latest-ungluing{display:none}.book_container::-webkit-scrollbar{display:none}.jsmodule{padding-bottom:24px}}@media screen and (min-width: 40em){#js-maincol-fl{display:flex}#js-maincol-fl #js-main-container{flex:1 78%}#js-maincol-fl #js-rightcol{flex:1 22%}.more_featured_books{padding-left:14px}.more_featured_books>i{margin-top:150px;font-size:26px}.more_featured_books_mobile{display:none !important}.jsmodule{margin-bottom:20px}}#js-main-container{display:flex;flex-direction:column}.sidebar_button{margin-bottom:10px}.sidebar_button input{background-color:#8dc63f;color:white;width:100%;padding:12px;border:none}.book-description{overflow:auto}.book-detail{display:flex}.book_container{display:flex;overflow-x:auto;box-sizing:content-box}.book_container .thewholebook{border:none}.jsmod-content ul{margin:0;list-style-type:none}.jsmod-content ul li{display:flex;margin-bottom:10px}.jsmod-content ul li .user-avatar{padding-top:6px}.jsmod-content ul li .user-avatar a img{max-width:none;width:34px;border-radius:2px}.jsmod-content ul li .user-book-info{margin-left:10px}.jsmod-content ul li .user-book-info .user-book-name{font-weight:normal}.signup{cursor:pointer}.donate{cursor:pointer}
/*# sourceMappingURL=../../../../../../../static/scss/home.css.map */
/*# sourceMappingURL=../../../../../../static/scss/home.css.map */

2
static/scss/landingpage4.css
View File

File diff suppressed because one or more lines are too long

2
static/scss/registration.css
View File

@ -1,3 +1,3 @@
.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}.registration{display:flex;justify-content:center;padding:10px}.google-signup{display:flex;flex-direction:column}.google-signup>*{margin:7px 0px}.linetext-outer{display:inline-block;width:100%;text-align:center;border-bottom:1px solid #d6dde0;line-height:0.1em;margin:10px 0 20px}.linetext-inner{background:#fff;padding:0 10px}.login_box{border:solid 3px #d6dde0;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;margin:10px auto;padding:9px;width:45%}.login_box .google_signup{padding:21px}.login_box input[type="text"],.login_box input[type="password"]{width:90%}@media print, screen and (min-width: 40em){.login-border{border:solid 3px #d6dde0;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:14px}}.actionbutton{width:auto;height:36px;line-height:36px;background:#8dc63f;border:1px solid transparent;color:white;cursor:pointer;font-size:13px;font-weight:normal;padding:0 15px;margin:5px 0;float:left}.welcomealternatives{border-top:1px solid #d6dde0;margin-top:10px;padding-top:5px}
/*# sourceMappingURL=../../../../../../../static/scss/registration.css.map */
/*# sourceMappingURL=../../../../../../static/scss/registration.css.map */

2
static/scss/searchandbrowse2.css
View File

@ -1,3 +1,3 @@
.panelborders{border-width:1px 0px;border-style:solid none;border-color:#FFFFFF}#js-maincontainer-bot-block{clear:both;overflow:visible;margin-top:55px}#js-maincontainer-bot-block #js-search{-moz-border-radius:64px;-webkit-border-radius:64px;border-radius:64px;background-color:#8dc63f;width:652px;height:80px;overflow:hidden;clear:both;color:#fff}#js-maincontainer-bot-block #js-search label{line-height:80px;font-size:19px;float:left;padding:0;width:auto;padding:0 15px 0 30px}#js-maincontainer-bot-block #js-search form{float:left;width:210px;background:url("/static/images/landingpage/search-box-two.png") 0 0 no-repeat;height:36px;display:block;overflow:hidden;margin-top:22px}#js-slideshow{padding:0 30px;position:relative}#js-slideshow a.prev{text-indent:-10000px;font-size:0;width:15px;height:22px;display:block;position:absolute;top:45%;background:url("/static/images/landingpage/arrow-left.png") 0 0 no-repeat;left:0}#js-slideshow a.next{text-indent:-10000px;font-size:0;width:15px;height:22px;display:block;position:absolute;top:45%;background:url("/static/images/landingpage/arrow-right.png") 0 0 no-repeat;right:0}.spacer{float:left;margin:0 4px}#js-search input.inputbox{border:none;color:#66942e;height:26px;line-height:26px;font-size:13px;float:left;padding:0;margin:5px 0 5px 20px;width:149px;outline:none}#js-search input.greenbutton{background:url("/static/images/landingpage/search-button-two.png") 0 0 no-repeat;width:40px;height:40px;padding:0;margin:0;border:none;display:block;float:right;text-indent:-10000px;font-size:0}#js-slide .jsmodule>h3{background:url("/static/images/landingpage/bg-slide.png") bottom center no-repeat;padding-bottom:7px;padding-left:35px}#js-slide .jsmodule>h3 span{background:#8ac3d7;color:#fff;padding:10px 20px;-moz-border-radius:10px 10px 0 0;-webkit-border-radius:10px 10px 0 0;border-radius:10px 10px 0 0;font-size:19px;overflow:hidden;display:inline-block;font-weight:normal}
/*# sourceMappingURL=../../../../../../../static/scss/searchandbrowse2.css.map */
/*# sourceMappingURL=../../../../../../static/scss/searchandbrowse2.css.map */

4
static/scss/sitewide4.css
View File

File diff suppressed because one or more lines are too long