From 15367a8b54673ce35fcfc1f330a9c25052998e07 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 19 Oct 2012 12:01:18 -0400 Subject: [PATCH 1/9] syntax error --- static/css/supporter_layout.css | 2 +- static/less/supporter_layout.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css index 1c32475d..e12f0fb1 100644 --- a/static/css/supporter_layout.css +++ b/static/css/supporter_layout.css @@ -203,7 +203,7 @@ img.user-avatar { } .user-badges img { vertical-align: text-bottom; - border: 1px solid #D4D4D4; + border: 1px solid #d4d4d4; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; diff --git a/static/less/supporter_layout.less b/static/less/supporter_layout.less index 1c2132a3..bb8b59d7 100644 --- a/static/less/supporter_layout.less +++ b/static/less/supporter_layout.less @@ -131,7 +131,6 @@ img.user-avatar { vertical-align:text-bottom; border:1px solid #d4d4d4; .one-border-radius(5px); - } } } From 11aac359e6d67ffab40c96c08f54f37d242d108f Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 19 Oct 2012 12:01:28 -0400 Subject: [PATCH 2/9] adding drop-down menu --- frontend/templates/base.html | 117 +++++++++++++++++++++-------------- static/css/sitewide.css | 42 +++++++++++-- static/less/sitewide.less | 46 ++++++++++++-- 3 files changed, 150 insertions(+), 55 deletions(-) diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 8c286c43..ef96eecc 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -37,6 +37,15 @@ }); {% endif %} + {% block extra_head %} {% endblock %} @@ -72,30 +81,45 @@ {% endif %} -
- -
+ {% if user.is_authenticated %} +
+ +
+ {% else %} +
+ +
+ {% endif %} @@ -118,43 +142,44 @@
About Unglue.it
Your account
Help
Contact
diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 05b2aa32..2d01ebce 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -610,11 +610,38 @@ ul.menu { } .js-topmenu { float: right; - padding-top: 25px; + margin-top: 25px; +} +.js-topmenu#authenticated:hover, +.js-topmenu#authenticated.highlight { + background: #d6dde0; + cursor: pointer; + position: relative; +} +.js-topmenu ul#user_menu { + display: none; + z-index: 100; + position: absolute; + top: 36px; + left: 0; + padding: 0; + overflow: visible; +} +.js-topmenu ul#user_menu li { + border-top: 1px solid white; + list-style-type: none; + float: none; + background: #d6dde0; + padding: 0 10px; +} +.js-topmenu ul#user_menu li:hover { + background: #8dc63f; +} +.js-topmenu ul#user_menu li:hover a { + color: white; } .js-topmenu ul li { float: left; - padding: 0 10px; position: relative; z-index: 50; } @@ -651,8 +678,12 @@ ul.menu { font-weight: bold; font-size: 13px; letter-spacing: -0.05em; - overflow: auto; - max-width: 240px; + padding: 0 10px; + margin-right: 5px; +} +.js-topmenu ul li img { + padding: 0; + margin: 0; } .js-topmenu ul li #unseen_count div { border: solid 2px; @@ -679,6 +710,9 @@ ul.menu { background-color: #d6dde0; color: #edf3f4; } +.js-topmenu ul li.last { + padding-left: 20px; +} .js-topmenu ul li.last a { background: url("/static/images/bg.png") right top no-repeat; } diff --git a/static/less/sitewide.less b/static/less/sitewide.less index c03259f0..6e96032b 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -265,12 +265,42 @@ ul.menu{ .js-topmenu { float:right; - padding-top:25px; + margin-top:25px; + + &#authenticated:hover, &#authenticated.highlight { + background: @blue-grey; + cursor: pointer; + position: relative; + } ul { + &#user_menu { + display: none; + z-index: 100; + position: absolute; + top: 36px; + left: 0; + padding: 0; + overflow: visible; + + li { + border-top: 1px solid white; + list-style-type: none; + float: none; + background: @blue-grey; + padding: 0 10px; + + &:hover { + background: @call-to-action; + a { + color: white; + } + } + } + } + li { float:left; - padding:0 10px; position: relative; z-index: 50; @@ -282,9 +312,13 @@ ul.menu{ span#welcome { color:@green; .header-text; - overflow:auto; - //emergency backstop to prevent usernames too long for truncate filter to force header into content area - max-width: 240px; + padding: 0 10px; + margin-right: 5px; + } + + img { + padding: 0; + margin: 0; } #unseen_count { @@ -314,6 +348,8 @@ ul.menu{ } &.last { + padding-left: 20px; + a { background: url(@background-header) right top no-repeat; From 1bf4743667d77703f84a91251e09e08e7975f119 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 19 Oct 2012 12:19:56 -0400 Subject: [PATCH 3/9] making notifications prettier --- frontend/templates/base.html | 15 ++++++---- static/css/sitewide.css | 55 +++++++++++++++++++---------------- static/less/sitewide.less | 56 +++++++++++++++++++----------------- 3 files changed, 69 insertions(+), 57 deletions(-) diff --git a/frontend/templates/base.html b/frontend/templates/base.html index ef96eecc..bc6f7830 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -89,17 +89,20 @@
  • {% comment %} - {% if unseen_count %} -
    {{ unseen_count }}
     - {% else %} -
    0
     - {% endif %} {% endcomment %} {% if supporter.profile.pic_url %} Picture of {{ supporter }} diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 2d01ebce..14f93fb4 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -640,6 +640,11 @@ ul.menu { .js-topmenu ul#user_menu li:hover a { color: white; } +.js-topmenu ul#user_menu li:hover #i_haz_notifications { + border-color: white; + background-color: white; + color: #3d4e53; +} .js-topmenu ul li { float: left; position: relative; @@ -685,31 +690,6 @@ ul.menu { padding: 0; margin: 0; } -.js-topmenu ul li #unseen_count div { - 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; - padding: 3px; - line-height: 16px; - width: 16px; - cursor: pointer; - text-align: center; - margin-left: -10px; -} -.js-topmenu ul li #unseen_count div#i_haz_notifications { - background-color: #8dc63f; - color: white; - border-color: #8dc63f; -} -.js-topmenu ul li #unseen_count div#no_notifications_for_you { - border-color: #d6dde0; - background-color: #d6dde0; - color: #edf3f4; -} .js-topmenu ul li.last { padding-left: 20px; } @@ -729,6 +709,31 @@ ul.menu { padding: 0 5px 0 15px; color: white; } +.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; + padding: 3px; + line-height: 16px; + width: 16px; + cursor: pointer; + text-align: center; + margin-left: 10px; +} +.js-topmenu ul .unseen_count#i_haz_notifications { + background-color: #8dc63f; + color: white; + border-color: #8dc63f; +} +.js-topmenu ul .unseen_count#no_notifications_for_you { + border-color: #edf3f4; + background-color: #edf3f4; + color: #3d4e53; +} .js-search { float: left; padding-top: 25px; diff --git a/static/less/sitewide.less b/static/less/sitewide.less index 6e96032b..e03b4ea8 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -295,6 +295,13 @@ ul.menu{ a { color: white; } + + #i_haz_notifications { + border-color: white; + background-color: white; + color: @text-blue; + } + } } } @@ -321,32 +328,6 @@ ul.menu{ margin: 0; } - #unseen_count { - - div { - border: solid 2px; - .one-border-radius(5px); - padding: 3px; - line-height: 16px; - width: 16px; - cursor: pointer; - text-align: center; - margin-left: -10px; - - &#i_haz_notifications { - background-color: @call-to-action; - color: white; - border-color: @call-to-action; - } - - &#no_notifications_for_you { - border-color: @blue-grey; - background-color: @blue-grey; - color: @pale-blue; - } - } - } - &.last { padding-left: 20px; @@ -365,6 +346,29 @@ ul.menu{ } } } + + .unseen_count { + border: solid 2px; + .one-border-radius(5px); + padding: 3px; + line-height: 16px; + width: 16px; + cursor: pointer; + text-align: center; + margin-left: 10px; + + &#i_haz_notifications { + background-color: @call-to-action; + color: white; + border-color: @call-to-action; + } + + &#no_notifications_for_you { + border-color: @pale-blue; + background-color: @pale-blue; + color: @text-blue; + } + } } } From 09d5b00e50e1e5bb91a53d97507e07a9cea52348 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 19 Oct 2012 12:26:11 -0400 Subject: [PATCH 4/9] highlight editing area if #edit is in url --- frontend/templates/supporter.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index d89b2c06..d50db393 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -21,7 +21,13 @@ From 104992612b4af1eb82fa1d63ee3cb7e5fb8924d0 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 19 Oct 2012 15:01:06 -0400 Subject: [PATCH 6/9] first pass at making things visually distinct if there are notifications --- frontend/templates/base.html | 4 +--- static/css/sitewide.css | 12 ++++++++++++ static/images/menu_bar_down_arrow.png | Bin 0 -> 427 bytes static/images/menu_bar_up_arrow.png | Bin 0 -> 432 bytes static/less/sitewide.less | 13 +++++++++++-- 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 static/images/menu_bar_down_arrow.png create mode 100644 static/images/menu_bar_up_arrow.png diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 2ff10a74..739da2da 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -85,7 +85,7 @@
    • - {{ user.username }} + Hi, {{ user.username }} {% if unseen_count %}{% endif %}
    • - {% comment %} - {% endcomment %} {% if supporter.profile.pic_url %} Picture of {{ supporter }} {% else %} diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 14f93fb4..f754af13 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -612,6 +612,15 @@ ul.menu { float: right; margin-top: 25px; } +.js-topmenu#authenticated { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + height: 36px; +} .js-topmenu#authenticated:hover, .js-topmenu#authenticated.highlight { background: #d6dde0; @@ -686,6 +695,9 @@ ul.menu { padding: 0 10px; margin-right: 5px; } +.js-topmenu ul li span#welcome img { + vertical-align: middle; +} .js-topmenu ul li img { padding: 0; margin: 0; diff --git a/static/images/menu_bar_down_arrow.png b/static/images/menu_bar_down_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..51e1136114d2116d19bf1f019255bb6099d58dab GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co#^NA%Cx&(BWL^R}Y)RhkE*Mzi`UL1t;N9^vvUp|(4|C0dDV)bPiRmV5Y`Jk<;b3NScst8-Ugw2J?bxy}8tq7a z&^AM}8f2h>%PVuk6CbM*Oda~JH!BA1=XAAY27)^io{GPI&~)%tDo<9Eq6XUv&Nc&< z?8CY4f&AuAj(%6x5W4p&vY`12i?hU@tD6IODn9<@m~;NkyfqgX9@qT*-0|?>?cF@P zg!%-|DlOxw|5s$ZL*w{k6NaOzJ7Q9_<(sZEtZ7Ry=9tfD!Ru%aq=24{m#pr;`F^>< zLD__)goGKco<)Cuef*xHmQnUj^>WWWtMkdPB~}K`V_>+$lDp{%>&k_|kYw<5^>bP0 Hl+XkK)Qp^d literal 0 HcmV?d00001 diff --git a/static/images/menu_bar_up_arrow.png b/static/images/menu_bar_up_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..5f29c13540f8e9c5aa5909b2b6a8a6b754cb7419 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co#^NA%Cx&(BWL^R}Y)RhkEDfDS90b*#0-fyt~6v$f0O* zLQIjz+`Er&Hf_NH}F!{B2nYruFN}>Q$D|R68|UYH2u~+E8$JnCserS$lsalDVB0> z-vmateLM{l^-nLD!of7{q=F!e&7Rwh6DBbBE`YZG}viL1)U%GGB-%I=dG8k@-{-YLE{Lp@x##fer zUXx=bh0^}3JEyN%rg0#V Date: Fri, 19 Oct 2012 16:29:37 -0400 Subject: [PATCH 7/9] css tweaks --- static/less/sitewide.less | 1 - 1 file changed, 1 deletion(-) diff --git a/static/less/sitewide.less b/static/less/sitewide.less index fbb1f785..42c558e9 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -344,7 +344,6 @@ ul.menu{ background: url(@background-header) right top no-repeat; span { - //background:url(@background-header) -770px -36px no-repeat; .border-radius(32px, 0, 0, 32px); background-color: @call-to-action; margin-right:29px; From 002298d51a8872af871d3d61039242b1c2c6871a Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 22 Oct 2012 15:43:25 -0400 Subject: [PATCH 8/9] don't need that conditional any more --- frontend/templates/base.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 739da2da..9c156eb8 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -127,11 +127,7 @@ {% block news %}
      - {% if is_preview %} - It's here: our first unglued edition. You can now download Oral Literature in Africa.

      Campaigns to unglue more books will relaunch soon. - {% else %} We unglued one book. Amazon shut us down. Now we're back. Help us unglue five more books!
      - {% endif %}
      {% endblock %} From 02f803291a9e364f62f783a8cb42a4511176063e Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 22 Oct 2012 15:43:45 -0400 Subject: [PATCH 9/9] communicate current outage, provide CTAs for current and future ones --- frontend/templates/503.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/templates/503.html b/frontend/templates/503.html index 4f8c3227..ac436a2d 100644 --- a/frontend/templates/503.html +++ b/frontend/templates/503.html @@ -1,10 +1,22 @@ {% extends "base.html" %} +{% block news %} +
      + Amazon database connectivity outages are keeping us from being able to unglue with you right now. See Amazon's status page for more. We're doing what we can from our end. Do come back later. +
      +{% endblock %} + {% block content %}

      Unglue.it is currently undergoing maintenance

      -

      Help us fix it by sending us feedback: support@gluejar.com.

      +

      +While you wait, why not like us on Facebook, follow us on Twitter, or subscribe to our blog? We'll keep you up to date there with our progress fixing things. +

      + +

      You can also help us by sending us feedback: support@gluejar.com.

      + +

      Thank you, and we're sorry for the inconvenience.

      {% endblock %}