From 513dbd021e1ff53eab4b76c35b7763af3379bac4 Mon Sep 17 00:00:00 2001 From: "Sebastian Silva (icarito)" Date: Wed, 2 May 2012 23:04:45 -0500 Subject: [PATCH] Some UI tweaks. --- app/app.py | 7 +++-- app/static/css/browser.css | 4 +++ app/static/icons/favicon.ico | Bin 0 -> 12602 bytes app/static/icons/moon.png | Bin 870 -> 820 bytes app/static/icons/moon.svg | 60 +++++++++++--------------------------- app/templates/base.html | 3 ++ app/templates/resource-grid.html | 4 +-- 7 files changed, 31 insertions(+), 47 deletions(-) create mode 100644 app/static/icons/favicon.ico diff --git a/app/app.py b/app/app.py index c3592c5..4b7a469 100644 --- a/app/app.py +++ b/app/app.py @@ -272,6 +272,7 @@ def context_grid(query=None, page=None): query=query, page=1)) meta = _("browsing %(total)s contexts", total=total) + stroke, fill = get_colors() if '_pjax' in request.args: template='resource-grid.html' @@ -321,14 +322,16 @@ def resource_browser(context_guid=None, query=None): context=client.Context(context_guid, reply=['guid', 'title']) session['last_context']=context_guid + stroke, fill = get_colors() if '_pjax' in request.args: template='context-content.html' else: template='context-view.html' return render_template(template,result=r,resource=resource, total_pages=total_pages,info=info,meta=meta, - resource_label=resource_label, - type='resource', context=context,page=page) + resource_label=resource_label,stroke=stroke, + type='resource', context=context,page=page, + fill=fill) @app.route('/submit_resource/', methods=['POST']) def new_resource(resource_label): diff --git a/app/static/css/browser.css b/app/static/css/browser.css index 2d973e8..51db187 100644 --- a/app/static/css/browser.css +++ b/app/static/css/browser.css @@ -179,6 +179,10 @@ img.star { } img.star-emblem { + border-radius: 15px; + } +img.moon-emblem { + border-radius: 15px; } .colored { diff --git a/app/static/icons/favicon.ico b/app/static/icons/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..ebf0a7606e7b7185ab165a35616461338c09f9f5 GIT binary patch literal 12602 zcmeI2Yiv|S6vt<+SjCt&21$sLRe4CX1kn%h$&$!J!1#frY6N3L-!;`#jrBzrtVv6J zBt$=$D1ksKB$W90WK5I>(5jKB2_ZlLYm6wQ(H2olyX^Wq+dE~L-q-HlmYVD||DHQ@ zX3qJab00Hz?kW}IZ_y&f|6A4Ug-T6VO3ec_si%OnOIf-=sT;2!L8hVbuaJR41_~LN zq!~yg5?9sM*3Pe~scA&+1mA%(;14k1NU2M^=o{+m>&s-^Bn?SbS6ANx&jk1hq;tSY z#%v(Ynr8hTE@Hj7?2V#c)5KQsyJL^-KO(ANZagO?P2G# zYn|M!%hgsCCE2vKa?ci@pmD`Pr24e*!&?EJe?|44?Qc+^el(zevgC){L>uAeC)W$Pj}TUrjBu^ zbxx35O`UxV&!lE%1KO`Y2@Tq*rj71g$ne+V0rznfueCal8 z{vFosL6W#e&l~sK>p}fR50}S)#9){GG~5kVf*P;}%mrP*E-4zegP`?^BDOb;{AY9C zPU~^lct1>RPJD7sRs*^2o&*cPbKpEMi`;u}gT+ARkPgrU%EJ1RXQSqb%;tXkR*xgL zePR9C{ouL<_?6F4UTu#HQ6m_OjvCp3l0(UQco!U-0td)lM)+`~os`^8CnZe*iu?uP5OvYwe$bUXLE} ziovTLzQ+vyL5FmWjwYmu8|ewZuI@mxL&?Ox03#z`^dH}t1jz} z)!=Kxrd~S?$aQ1&AD1eA=HTD!d-qZFE#S^D&SmXNPF}>`F_)Mmwh8;*t@$=LH(!U} z&A|N5qw}og8T5X?Q#gxW_qC;bdv1^7JDcX5t;D~~?|Z>TVDrnRE_S*&mvgh_GG6_i z>oftc-W+3;ahs!lzDF6a^G-Y;o((|0iOcV{y|}2qRSlMJEFF=mG&Xo2b^Mw# zK|M+PC0ROB-{{D0Rg}^9s*;RMsf5V#q)KG$T$1HZy&S*EIPF@(Cq*m?_@yKk_`<(U l_>ab;2DAo{Tz>#bL_t(Y$L*6bNE=ZY$N%r%ouQ#MjS_HZhEhb7(m*H(Qn5pa zEGm^EWO1v|Lf1kw2;G!oDOdzWEfz{L6}luTw3AbdAXU&obIM5|AzJU5n3G)Yz7APz zf*^T1wg2^l-|zju_a5+%Mp3Q+8Va%RGc)Rft^u^7ZJaof176g zisI>9u6D_7ZBh#LZaN)&Rwy{m--7H<*R2U65y=+4y?=n~PEIzqXpQ9aYc zFgJGzEe-zXit+~_t6+ugyA8mTmjWLWGBP?eGdeRjEig4YFfg5Pt+SKJ0v{4GGCDLf UIx{ydFf}?bFzhWA50m){E6r?aDs4ccqsdYB*cZVSBk3^Ds z*}f10d3Zmc=M7Kt0{?p?`%9Xeflvqt1_4O|3I$+y7s%&d*ndkf2&}9~uWoMvvhtdU z3-QyN$xtMd6mxS8z^A7rcc}!BzPCb5O_8&+WM?P2xX9{=tu34Ig$00o^FfGsoGh0~ zO(XmJ$?HRZfkiZ+OG@X!+8HL<_{`G*j-%M%HGa!yXn1V=}e9N8G} zc9*~R^?l4qb>GR^86e9*Pmft^ief>~(IJWsM{jR^C6fWX-dapWXi4C50f56{T$N2$ z0RSXR0#%h1A|3f_zPYJ> z9uDjGWYU`8nfU#3`~Cf=gb zg6nG=0!0BfHUM&Xm^?n#5f>L^Yb&|7W+cdFZ3qCs=>(RR03jra92p^(m&r(k^!Z3t ztrg^QHa`VV85#mMH){`@aF{$jH5W8+WQIb(;2_}l>$@uyUI$XCUtjO;n!dEP0o&V> ze09~}F8;y%0rj3O2ao236O&~E9}+MzIx;ajF*q$SH99abnfYisla>M>5->43GBG+a SI4v+WIxsNkq|kimage/svg+xml \ No newline at end of file + inkscape:current-layer="svg2985" /> \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index d901ed4..4816348 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -5,6 +5,7 @@ + {% include 'toolbar.html' %} @@ -56,10 +57,12 @@ $('.star-emblem').click( function() { if ( $(this).data('keep') == true) { $(this).css('background-color', '#fff'); + $(this).css('border','none'); $(this).data('keep', false); } else { $(this).css('background-color','{{fill}}'); + $(this).css('border','1px solid {{stroke}}'); $(this).data('keep', true); } $.get('/_stars/' + $(this).attr("id") + '?keep=' + diff --git a/app/templates/resource-grid.html b/app/templates/resource-grid.html index 434f65b..89adabe 100644 --- a/app/templates/resource-grid.html +++ b/app/templates/resource-grid.html @@ -19,13 +19,13 @@
{{context['title']}} -- 1.7.9.5