From d8f00b2012dde670c85ad6fa30846f3553bc29e3 Mon Sep 17 00:00:00 2001 From: Josh Adams Date: Mon, 16 Feb 2009 18:49:19 -0600 Subject: [PATCH 1/2] added a background pattern for the admin... --- public/images/admin_bg_pattern_1.jpg | Bin 0 -> 5168 bytes public/images/admin_bg_pattern_2.jpg | Bin 0 -> 2893 bytes public/images/admin_bg_pattern_3.jpg | Bin 0 -> 2798 bytes public/stylesheets/admin.css | 5 ++--- 4 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 public/images/admin_bg_pattern_1.jpg create mode 100644 public/images/admin_bg_pattern_2.jpg create mode 100644 public/images/admin_bg_pattern_3.jpg diff --git a/public/images/admin_bg_pattern_1.jpg b/public/images/admin_bg_pattern_1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ec763de47d597b6c29cf3a57f3b4610b5bdb8fab GIT binary patch literal 5168 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 literal 0 HcmV?d00001 diff --git a/public/images/admin_bg_pattern_2.jpg b/public/images/admin_bg_pattern_2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..149a9800790255a0eff6bb551aea59501bb781f2 GIT binary patch literal 2893 zcmbW0c~lbE9>*`6AQEb#$&3pLxn+}xm58`x0a}5QT3R`2I#Opc!EznS-0dEI9Ii7VB5cEvsPG6v4EY;-g7t~$!;ujLFK;Hn+h;qI z5VP6A#*V;05%T@vk6K8SHd;s1P^$-^5Eu*!hkbFa=}yw@1Gqk7 z^;)urmVs{w(t?k3NXxl`B5u9iY{>1LBvC>I>Dp+cHOBa_)>&Fv+t@m8+PuYy>g>5~ zJA=vc^4{&|AFyX{V9=qk@b4mchmS-bKM@lf7oU)E^2bxB&z#LXpDW6{kY8}|($%8k zl53@9a|3qsmzgSoM_=3kb))N+TC9nbi#Is9F2lXCPjh{j7ytBiY(?sR3s&^N06WYfM#N<=0 zaTT3}cxY~ofl&M=sJcvVEfN;Ppp3d>>T*K0Y~0ZdW^#=zfIgPJ{Bgg~wnf+QDXPti zXX-Vp2D5%sEjeWCdmK9D5{SmcG|5e^Bbnx>-+L!2t6UqoxoL$QP61WsAtyvWEip?_ zSW4>Z4Wc;hl>S<_>wNHX^{BgcPFmj`+{Tod-$h}Ee)gtyK+P!Q8B1fddRh9eqQWXQ z2r3~cOw=IPLt&NMR|~i&o1oPp2l$t}V<~tRAsjbhqU&AXd)tUqN>x^s_&4OC<5{Q| z?yXLv?mumwB-ylYi9Oa@Vh8?6m@gUskRq=&QMk-IVzwfwdk99usTSv_Nuk)ii@GF8U82e{_=0(5iSwL+5nc-hMVZy0a?HN=3jmSCKC$RicuVO0Xy3fkkwyF2?QUD75PG0JP$l)OE68};AgmX?=K zSwoJI$d6)f;hn66P8HMrC<$XsidU4dA_Cv)5GSJ3Q`&8A1v`fLKR98$kngf0LRGl# zTt_A@*F#|S}`z|aG)hGQX{>9B3ZdG8^k%x}5_n3H9 zmYO^XFC$uQ68N3(5pM$w&iYSDw%hNf;S^=f1l^Td*!mlH|K@ACxed@0KKI;mLaD; z51PG>uY|w7H$S%`!cZETrKTy~oR$b-cLQlo4Y1bK5B%BTRBV!f-0xa*QozsYlW0QT zMFu8^RF;<+4oMVuh)GU6b=+rvzqY5narD3tf46>C7AAUhl;Mza+G@!fTHR9DJKg|$ z;Qsl(8hrKrW}co)JyjYE%5Pq!Y}=gHyh@%>Zr94oL+20($J-NqEdE}3v<8Zc1nJ0! z`@8v1dv6-;E@-2%UtI%(WDtg#m2OHNLDck1VK9{hrOcl|q-R@r?ME`REthR7tlK!QfD_(EUI9<$vHAXYaEEQ~6S>(uDkSr;pNw;p_+6D>bFrQB*Z>?Z!CC26HYS za(xrT=68SYQXo6{Uahp4c?n`7E$35V5L!W()6e-=*Uvx#U{UzjQcYwluHORU!V-Wa zT8+`3-->IdC+%{~8aiZE$QFeioTNuLKLgeiVt45cvZ$ayw~;|Doh%MZTi^nx(Oi`T zZEv^Toqx)#Sg1+=zJ?zLn<=#pUbA%D*t$&53qEY5r_bv~U&drv^O9Q-d|k~?U)2c0 zDv!&r;9e55?%EOU_J&vRg4c`ozDyo5yF9hq6V4ZuQJUmIAg_dFqg#yAJ}a8&(XyA}*-rhqvvzx?R(4vhJo4gVx50qUx%#hJ zkyz%=4&n~8VNurN%&chzP+y~KW8b!2-h()FSXcM`f1 z=OjTWkr~e)_ErwOT6h`W^n*BFnR!|N&Q01>rg5q+4r1B}#gb>j!W+t&RaT|k!}bo$ zD|4z6<5{_5P5!(fr%jBeAY~ z@J-SnZL7f8AoKP4{>`R*fA~>?U1c^FYunRu)WBurvD<5@DR0XNWMLOfugO(*;lNF5 z`9z@jwYJ7Z=>}QB+Xt+fPDWzV;jaBvqT4Na7I9kIo4WC)z)4D+ES3?>5<)8j_pgDV zXriQ#K{buZ04u_1Zx|Qz4n}e4YLI8?MC|WM*U~jMUp@i^N*5)ySed1~W70WaaPDCc zTOm{|%}Nlme&K8DF*mnwgCI`xO%rO+SFvW#PA|WwgJK4CIF}tetYnEAr3Td{#rn0Z)e8qvzx)SDY4lD2 literal 0 HcmV?d00001 diff --git a/public/images/admin_bg_pattern_3.jpg b/public/images/admin_bg_pattern_3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..99987a783b9f01097f8baa20c069aa78b52891b3 GIT binary patch literal 2798 zcmbW2d05if8pnU|13@$p#R5a6K_#80n_Jo9iKq&N+83Z#J90`ZRU~m)yVT3eAnVOoQ zOiWgw&COPzv1k($vz2C83!J5;r730=ekBfXj4Hh5_end~=#)HT)XG(Of|b1kWv!!=oBPI1 zR1eR9EnDf^7~7elA>E5qxzddZ1b;uueb@%i>>+661;*U|~*!U~eg!=W= z^o&+FJNIE;|A`9%fPY~b#=pS+g9~fmg2G@R4DpEz0zGEvAQlE+<7{N^AB>1fw)o72 zkHl?0Q*pD^nCu!dX&IgJJ8Gq!+aLB*pV0m!`|rT={x7nBf&H871z-w748;SnfFJNN z9UpO6svZ>9f4RQz*l_|G0K8`W&yBGz-EWYs-aYeV!yCb>(CCLP&t*CFu(JV4ee3o= znCKwpIMEwRH=V^iV%c2s?7g=2;l0?Wvvakq8;X{BH+0(?eqzts_CS~9XO*2a?PyUV zb%fiWqf=9<6Fig=ES+q-bdRb6Vh{~@yw75bZ9OcFs1naS%UxBWBxq<9GP&EWU^>u; z#qwzEv;$Ae{4nChz z?fGMRf17i;a`@#P#_WW%zIW%Ak(vc$s&5bSNHS-3e*g2qN?}4>N01pEV;RkI9R8-b z){cYIXUAn;#JZ$2?`Yl&Lr^?5ZDGUts^h5qy|OA;EmPc@8#um!9r#k9nRr*x>u8)1p~CsUlF z=I+hC6*GYyMd;?c6`9L`NPC4$52G zB}l7IYZ_@`(ppB&7TB*q6~^P%E2!9zE}s#>e;BM-mG#WIEzSJj1( zPOq~r@onCioL#~44SaATgZiF^;z;$&fKKC`pXkdDQkG}-mRzN~wk^5uA9`ne*eeKp zUkH16!u0m}B3Ka1Lmk#%NS&>2gmP)dhXJx~wg)dK_1 zel$599M0_kcF8=HQ*xaonjPCX{yrdvGNrAe2(NpWX#6{T7@DqJkl&}1Rejae5YGQR zw~eUp6{Ywr8dvaA{pNZB(tDYWSokbIU*vaiso9YtK6t$uL8fR7`d^8_RH?kauGd{tE=($#yEGagKp-(SC_3Rww_J|qyN~Z3hlp5yxGYu zp?wE6uX`E3{d`HD=W*PV*OR{-3BGfkybSaOR|+kXVEJhkv zdmVU6eb2l#+JzTu(;y})j%3W2^7$f6v)jDNbsFh?JQe-wqDQ9>W~MR{^D|dgwG}QC zRf>pEf&?J&U%YLGQszv1Q0M(MBUY-NQ=)ciWi0C$y!D`-N-|$y+ZJ7D_O!pHhX0_aD;cA zihafPcE#?u*(;`gMv$*J#0fYYU}UU!ui;o2OFv4vS~sM?p7zl1WGIZC`s$i|_2&LV zt*Qpb%Uzd~O5#zgR&$@0C12|DMagYLY8l*$67iizuY+xPS zwUg|Dm#ey~2zYPIzDX_(YuH2^3uPV*&-ww=TBLi>K;t zZ%MSHjtBBY4c};$1eqpWwStp1BY041e0Fc^Z1wuFa|rx`Q^&1>nemx3ovaVNj6J8P zR(&o`+8Vch0~JwI1r%)AjlxB8;!`+WIz2O8D;Ys^eC|r3mE%4%-9j8Wzeo2b9*HOs zEIKoiOQZ^4Q7Q0-D|IMJ?!KWc^CX%cKSv)OYm^hD%5}}Gu3U3u*{jW}abQ;2d|+_< z(mHN<-K(MR98426f(*T`R!}ifu(HPMzISp39#UoVTB=?=C4qaV zEePUFIT@6na-0Gh5hC4+C(?Yv{(;j)>&J%fb;gill|2h3rud*-8 z10`m1l&(+b$*m zDJpN3N2RJr)kyq(?!xyi5rIm9azQ77%LfEQYhU~M9gKib=cI29&qiHXnEmPRA=am* zW2!1(ZCZ2-psVqxf+V rI{yQY<5PQU9W86xwP|U>;1+W2)_{CHdN#4Ct{|&M(AEI;TYmlzM;7hN literal 0 HcmV?d00001 diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css index 514caec..1b9679e 100644 --- a/public/stylesheets/admin.css +++ b/public/stylesheets/admin.css @@ -1,10 +1,10 @@ html{ - background-color: #ddd; + background: #ddd url('/images/admin_bg_pattern_3.jpg'); } body{ font-family: "Bitstream Vera Sans", Arial, sans-serif; - background-color: #ddd; + background: #ddd url('/images/admin_bg_pattern_3.jpg'); } h1, h2, h3, h4, h5, h6{ @@ -76,7 +76,6 @@ em{ #sidebar{ float: left; width: 25%; - background-color: #ddd; text-align: left; } From 4ef5e7f22e724674663d8039ef14f403d772afb8 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 12 Mar 2009 12:13:44 -0500 Subject: [PATCH 2/2] Fixed an issue with has_settings if the app database hasn't been created yet. --- vendor/plugins/has_settings/lib/has_settings.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vendor/plugins/has_settings/lib/has_settings.rb b/vendor/plugins/has_settings/lib/has_settings.rb index cb89e4a..d5d4da8 100644 --- a/vendor/plugins/has_settings/lib/has_settings.rb +++ b/vendor/plugins/has_settings/lib/has_settings.rb @@ -22,7 +22,7 @@ module ClassMethods # >> w.reload # >> w.settings["foo"] #=> "bar def has_settings - if ActiveRecord::Base.connection.table_exists?('has_settings_settings') + if database_setup? has_one :has_settings_setting, :as => "configurable" after_save :save_settings @@ -50,6 +50,15 @@ def has_settings end end end + + protected + def database_setup? + begin + connection = ActiveRecord::Base.connection + connection.table_exists?('has_settings_settings') ? true : false + rescue Mysql::Error + end + end end end