From fd9807ffc33c85552e39d5f7d367ba7a32d8cc2e Mon Sep 17 00:00:00 2001
From: Jef van Schendel
Date: Thu, 7 Jul 2011 17:21:02 +0200
Subject: [PATCH 1/9] Experimental black-and-white style change
---
mediagoblin/static/css/base.css | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 53e019f6..0fc33ed7 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -1,6 +1,6 @@
body {
- background-color: #272727;
- color: #f7f7f7;
+ background-color: #1F1F1F;
+ color: #aaa;
font-family: sans-serif;
padding:none;
margin:0px;
@@ -18,7 +18,7 @@ form {
font-family: 'Carter One';
font-style: normal;
font-weight: normal;
- src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff');
+ src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=FWNn6ITYqL6or7ZTmBxRhq3fkYX5z1QtDUdIWoaaD_k') format('woff');
}
/* text styles */
@@ -39,7 +39,7 @@ p {
}
a {
- color: #86D4B1;
+ color: #fff;
}
label {
@@ -56,7 +56,7 @@ label {
.mediagoblin_header {
width:100%;
height:36px;
- background-color:#393939;
+ background-color:#2F2F2F;
padding-top:14px;
margin-bottom:40px;
}
@@ -64,7 +64,7 @@ label {
.mediagoblin_footer {
width:100%;
height:26px;
- background-color:#393939;
+ background-color:#2F2F2F;
bottom:0px;
padding-top:8px;
position:absolute;
@@ -160,6 +160,7 @@ text-align:center;
.form_field_error {
background-color:#87453b;
+ color:#fff;
border:none;
font-size:16px;
padding:9px;
From d6ae709c14a628edb2c493654f0c02146503b7d8 Mon Sep 17 00:00:00 2001
From: Jef van Schendel
Date: Thu, 7 Jul 2011 17:54:33 +0200
Subject: [PATCH 2/9] Additional style changes to navigation; add three
navigation images
---
mediagoblin/static/css/base.css | 12 ++++++------
mediagoblin/static/images/navigation_end.png | Bin 0 -> 718 bytes
mediagoblin/static/images/navigation_left.png | Bin 0 -> 406 bytes
mediagoblin/static/images/navigation_right.png | Bin 0 -> 383 bytes
.../templates/mediagoblin/utils/prev_next.html | 13 ++++++++-----
5 files changed, 14 insertions(+), 11 deletions(-)
create mode 100644 mediagoblin/static/images/navigation_end.png
create mode 100644 mediagoblin/static/images/navigation_left.png
create mode 100644 mediagoblin/static/images/navigation_right.png
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 0fc33ed7..09f08445 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -205,14 +205,14 @@ img.media_icon{
/* navigation */
.navigation_button{
- width: 139px;
+ width:139px;
display:block;
float:left;
- text-align: center;
- background-color: #393939;
- text-decoration: none;
- padding: 6px 0pt;
- font-family: 'Carter One', arial, serif;
+ text-align:center;
+ background-color:#393939;
+ text-decoration:none;
+ padding:12px 0pt;
+ font-family:'Carter One', arial, serif;
font-size:2em;
margin:0 0 20px
}
diff --git a/mediagoblin/static/images/navigation_end.png b/mediagoblin/static/images/navigation_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2f2729698bf8443ce687ab4a6a872726735cc19
GIT binary patch
literal 718
zcmV;<0x|uGP)FN`H1O
zGH5A6C_;f`MhjtFI9koZg(x`MCTgMJLI_*A5QG#Xgo(6`(Ss6#CE~PdF}wr1w_3aE>Z@J4ZMz>1RO?6Ly*LxY(PX0WZ2--9y^bLKJC#gCY4Tqkcv#Cs*T
zt8uJFe>5{6bTjh_4zvhiCL+d)@if*n=>EV7=nP+8L|nxCE%3eg88U43v>aWmJ{8IU>bk7z?)(=Gk%!_I0y#%6|tZsGPrY;F*r%FH<^
zjR
literal 0
HcmV?d00001
diff --git a/mediagoblin/static/images/navigation_left.png b/mediagoblin/static/images/navigation_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1645120322caaa60c8173e8c7dbcc7fc2575397
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^YCtT_!3HD+ZvMRsq*#ibJVQ8upoSx*1IXtr@Q5r1
zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l3VXUZ
zhD5Z!y|z2+Pyj>wM}N(rBRlyYYIRKCDPAHzUGLVy{0A!**S0+~s$4VM_Y`&$HkIw&br^mF2APpwHij;&h9SRZ=GM>}y@EZ1sAXXyzk=IQUQvn)GM
zyrCw&T{x8~n?d;j>x*O8*01eq`g9=bfVRQ0|GCR%1aGvt=B%^
x+IqF2`oUp7^;ba=iGOd)A3dZ6bhz#t@wbP>H(mHWF9R5c44$rjF6*2UngBDsrLq73
literal 0
HcmV?d00001
diff --git a/mediagoblin/static/images/navigation_right.png b/mediagoblin/static/images/navigation_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4caa7b8ba1fa404cefa63a7d216f346a64960f5
GIT binary patch
literal 383
zcmeAS@N?(olHy`uVBq!ia0vp^YCtT_!3HD+ZvMRsq*#ibJVQ8upoSx*1IXtr@Q5r1
zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6f7@pN$v
ziD-R$Wv|x}2a&di>fIZf%x-a23troHuYK);>kIcLJmT~v-c~ax*lA*l!4%7XMomZC%ulDBJ$kgpSdx_BQgN9+t|GG`o
zI6luH_-(tzifb>{^9FU^O@4QHv-q4u{^edjDa!S?S9mU}Ut^eia-)AqQt8Vh
auRd|D{C?4*OEDZ2ybPYMelF{r5}E+h>7
- <
+
{% else %}
{# This is the first entry. display greyed-out 'previous' image #}
- X
+
+
+
{% endif %}
-
{# Likewise, this could be the very last media entry #}
{% if next_entry_url %}
- >
+
{% else %}
{# This is the last entry. display greyed-out 'next' image #}
- X
+
+
+
{% endif %}
From 0a45fa590395a12dfd529a67a8264aab48099819 Mon Sep 17 00:00:00 2001
From: Jef van Schendel
Date: Thu, 7 Jul 2011 20:04:30 +0200
Subject: [PATCH 3/9] Change pagination styling; add 2 images
---
mediagoblin/static/css/base.css | 4 ++++
mediagoblin/static/images/pagination_left.png | Bin 0 -> 252 bytes
mediagoblin/static/images/pagination_right.png | Bin 0 -> 249 bytes
.../mediagoblin/utils/pagination.html | 17 +++++++++--------
4 files changed, 13 insertions(+), 8 deletions(-)
create mode 100644 mediagoblin/static/images/pagination_left.png
create mode 100644 mediagoblin/static/images/pagination_right.png
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 09f08445..18a60f50 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -122,6 +122,10 @@ a.mediagoblin_logo:hover {
text-align:center;
}
+.pagination_arrow{
+ margin:5px;
+}
+
/* forms */
.form_box {
diff --git a/mediagoblin/static/images/pagination_left.png b/mediagoblin/static/images/pagination_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..56a26596d12e370eae8d853c7dde982fbc72f805
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^f%RlvAJf4T$n6bEg+wkZczIZ$u9ae
r$?5LwlN?)C`uNqVU!NFjJCnh{XJO)^NnUn9M=*H0`njxgN@xNAeOg#b
literal 0
HcmV?d00001
diff --git a/mediagoblin/static/images/pagination_right.png b/mediagoblin/static/images/pagination_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..84f8abba7d6249ea6780add165e790b5b902753e
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^fV#>Z0u|to=`a{&CVg6Wuq&Q*n_Wq|E
zcduZ1wK^f-{T>~DHKucFU7-)oO5@Zq&7k7D0)fPIG9)oh-u#cA0>%%0~AnAb;7
nQgNs}?)Pt>U(Sh__CFb$4ALKbi#=!$bOD2>tDnm{r-UW|u4-1f
literal 0
HcmV?d00001
diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html
index aae50d22..23d49463 100644
--- a/mediagoblin/templates/mediagoblin/utils/pagination.html
+++ b/mediagoblin/templates/mediagoblin/utils/pagination.html
@@ -34,9 +34,16 @@
{% if pagination.has_prev %}
« Prev
+ pagination.page - 1) }}">Newer
{% endif %}
-
+ {% if pagination.has_next %}
+ Older
+
+ {% endif %}
+
+ Go to page:
{%- for page in pagination.iter_pages() %}
{% if page %}
{% if page != pagination.page %}
@@ -50,12 +57,6 @@
…
{% endif %}
{%- endfor %}
-
- {% if pagination.has_next %}
- Next »
- {% endif %}
{% endif %}
From 7fb39157e0e4e5610dc8cfaf6c91278688d2d977 Mon Sep 17 00:00:00 2001
From: Jef van Schendel
Date: Fri, 8 Jul 2011 15:14:27 +0200
Subject: [PATCH 4/9] Remove p style; not need yet
---
mediagoblin/static/css/base.css | 5 -----
1 file changed, 5 deletions(-)
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 18a60f50..02fa3469 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -33,11 +33,6 @@ h2{
margin-top:20px;
}
-p {
- font-family: sans-serif;
- font-size:16px;
-}
-
a {
color: #fff;
}
From cdc8cb285dc4aec215cac763d423c6c7e12d0926 Mon Sep 17 00:00:00 2001
From: Jef van Schendel
Date: Fri, 8 Jul 2011 15:22:15 +0200
Subject: [PATCH 5/9] Added sidebar to profile page; moved some content
---
mediagoblin/static/css/base.css | 8 ------
.../mediagoblin/user_pages/user.html | 5 ++++
.../templates/mediagoblin/utils/profile.html | 25 ++++++++-----------
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 02fa3469..9dc6444b 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -257,11 +257,3 @@ ul.mediagoblin_messages {
background-color: #f7f7f7;
color:#272727;
}
-
-/* profile stuff */
-
-.profile_content {
- padding: 6px;
- background-color: #393939;
- margin-bottom: 10px;
-}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index aed330c8..97a882c6 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -28,6 +28,7 @@
{% if user %}
{{ user.username }}'s profile
+
{% include "mediagoblin/utils/profile.html" %}
{% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
@@ -40,6 +41,8 @@
Submit an item
{% endif %}
+
+
{% set pagination_base_url = user_gallery_url %}
{% include "mediagoblin/utils/object_gallery.html" %}
@@ -55,4 +58,6 @@
{# This *should* not occur as the view makes sure we pass in a user. #}
Sorry, no such user found.
{% endif %}
+
+
{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html
index cd60bbfc..f44defa5 100644
--- a/mediagoblin/templates/mediagoblin/utils/profile.html
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -17,19 +17,14 @@
#}
{% block profile_content -%}
- {% if user.url or user.bio %}
-
- {% if user.url %}
-
- {% endif %}
-
- {% if user.bio %}
-
- {{ user.bio }}
-
- {% endif %}
-
+ {% if user.bio %}
+
+ {{ user.bio }}
+
{% endif %}
-{% endblock %}
+ {% if user.url %}
+
+ {{ user.url }}
+
+ {% endif %}
+{% endblock %}
From 681e137194ec68632e0feb54955f2e23c0c7ed71 Mon Sep 17 00:00:00 2001
From: Jef van Schendel
Date: Fri, 8 Jul 2011 15:53:45 +0200
Subject: [PATCH 6/9] Moved Submit button to header, styled button
---
mediagoblin/static/css/base.css | 17 +++++++
mediagoblin/templates/mediagoblin/base.html | 6 ++-
.../mediagoblin/user_pages/user.html | 51 +++++++------------
3 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 9dc6444b..1cc26cad 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -56,6 +56,23 @@ label {
margin-bottom:40px;
}
+.header_submit{
+ background-color:#aaa;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(##D2D2D2), to(#aaa));
+ background-image: -webkit-linear-gradient(top, #D2D2D2, #aaa);
+ background-image: -moz-linear-gradient(top, #D2D2D2, #aaa);
+ background-image: -ms-linear-gradient(top, #D2D2D2, #aaa);
+ background-image: -o-linear-gradient(top, #D2D2D2, #aaa);
+ background-image: linear-gradient(top, #D2D2D2, #aaa);
+ box-shadow:0px 0px 4px #000;
+ color:#272727;
+ border-radius:5px 5px 5px 5px;
+ padding:5px 8px;
+ text-decoration:none;
+ border:medium none;
+ font-family:'Carter One',arial,serif;
+}
+
.mediagoblin_footer {
width:100%;
height:26px;
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index b71fca24..d6890ac0 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -39,7 +39,11 @@
{% block mediagoblin_logo %}
- {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
+ {% endblock %}
+ {% if request.user %}
+
+ {% endif %}
+ {% block mediagoblin_header_title %}{% endblock %}