From f92ba7e4251b83f7bfc2f16c5848a19d83ff75e1 Mon Sep 17 00:00:00 2001
From: mindctrl <dailyrants@gmail.com>
Date: Wed, 12 Sep 2012 00:16:53 -0400
Subject: [PATCH] Add nav menu check to fix error when no nav menu assigned

---
 .DS_Store                   | Bin 15364 -> 0 bytes
 css/.DS_Store               | Bin 6148 -> 0 bytes
 custom/.DS_Store            | Bin 6148 -> 0 bytes
 header.php                  |  45 +++++++++++++++++++-----------------
 images/.DS_Store            | Bin 12292 -> 0 bytes
 images/devices/.DS_Store    | Bin 6148 -> 0 bytes
 images/foundation/.DS_Store | Bin 6148 -> 0 bytes
 js/.DS_Store                | Bin 6148 -> 0 bytes
 8 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 css/.DS_Store
 delete mode 100644 custom/.DS_Store
 delete mode 100644 images/.DS_Store
 delete mode 100644 images/devices/.DS_Store
 delete mode 100644 images/foundation/.DS_Store
 delete mode 100644 js/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index acd30a8b3c7614b2f9d3f0ef006b53a9d0785b9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15364
zcmeHM-EJF26h4!rjqN0jX&YLCKvr`BQj^F@9BL#`jgyq-qDrVko6wZhKO1MsX4l$X
z+ezJki^R_bH#`8ZK*a@DyZ}$oI|N7waR)De;G3CsylZbtRVitNX04qwJ9EA{GvA&w
zKWidl*=lKuC_zLK++4;7k%U~lp5I+pk5}><Bm<tPLR(Z>G^}F5=+agNiUGxdVn8vV
z7*GtH1O~8X^D8nSrAie8iUGyI0Rwz~NZ{r&<H@F!V(LI5jsTE-C>9s;I0pz!!jl<K
zHl-9$v?)&y%!4xTh`}Tr^$D&Hnek*(N(m<>;lw=4%sZhlVI8=HP$!m=Ql*Lk#XvU$
z{OsOODN5p=^q=3Y0%~|LeT69B|3_Q`K0tZ0sfd%lPBqfPQ4HS}I#2~FpnV$%2fq+o
zFfm8eyXdnu2s;+-;HQyE?xDCpI&i(f!HWD6AxDB%e<M2ey{~mot5A0;1w&|kTc{Yi
z<0g}jSx;}@snh+DNGvkAep@$7Ry}J~&60B`w`J9HdPytf?YkoH=H053&D)}8Iqz<v
zM&ws4%RqkJ)4r{j+^voHg+?Pal^jo`XZObwjr2@vJdwJR+TV{xBhmO5k&#Q2Z(U!>
zHy-SN{E6V3m^bCokbFK!A0p?Cp_a2v!!pY#;o7G${wf%7IeUH<Q1@jA3jy8dz(pEd
z%%%kw$v417`pUC%5g17aBLlPvzpcS%xks78|4b_Txq)ZEkJxuU4~YR~;pf8t>@c4N
zpNNlu&kg}og@qzey08`M?XZLx2_R#LDGj|W9cB$ZLxl8=1bVmyYdb)hB05~!CD%VH
zX(uqM)94pRlwl_jBha1b@(!QwbMOv0$JCqC!aJs?xOb$V-8+0E(Tg=N=GpJ9nEyE*
zZ$*7HHZVAJW;p)B*>mSdUc7MerO}a>M_+k$bR&MQkS}hRZ9WyuS%zh2jjDF1Z0n_5
zC12Fd@~W%tx;g#6wh=$up?Xs*eb_Eq*{eY3e7it2_pYsJrf6?zbJNk>)s6VDQ?xC^
zShgJ9)h%<)SG%_EU@}^CwVg$C(}KmCuGN<+T+O+q*$!kEe)X=AFKEV+nYCQk+F8rn
zcHS&&*}YZ0XqmF-!=hO{F54P!a_s6~aCBT_nH#Ol>t3c+6{ohAtb%%1CVEg5UD?L0
zI+nR7b)wk+U8Z;F2Hm1<x=&xzH}r^ppdaZc`jh@<{VdKdvCAyQ-e%X>b@m?nfEAg+
zc36$o*#q{OY^J9*S0?0hD`lS}7x4Rz`5}s!Fh%6;hQ+y@8v>EnLmvgB2Rc__<e@J*
zg^n+39<_Y!2-la3jmAuRW;`*Slwrds)!C_JXV~!dr77t-bb<L4^<oGrT#hANGS}oA
zX$MI=cl_ZZ-h4-x43Qxg#0pJdGbfjjkgXj22Fqd~T!wu}M=W!46B&x;OXCyJJXFhQ
zFLd*X@S6krS6>)L4s3^5gC3Usfd0_I*e1kcZU7&G^hO!9^h8#~xcvIVbdwe^?agE2
zTYwF|EZdj>OJKQ9W^f^=_pvzt;u}{?Y^V8#fp3r}vEk@g{3REGjX1|x*oyN_4d0lA
zVZcWKa|W74VT*6W9c)uLnlsX|g_4W}HXAYM^G(g6Z(EM1m7)bAZm*5uTQD0V40!`B
zl#~KH0IV)1@`AAXbSU1-|MDuIF<~hRj7xi-ABG(`;D-S&1WYB0fs?^Nuk1#GfB#=N
z{Qv)x(OK0C#eibqNEl#!^SSvfnr<DQI<54eAc6ZHZhmpSrj!DLgsbp!@i`t35j=_`
zBFd7yj$g=UJlT{ICAg0L&j3dqXpZGTBi=5Ou~tT%|Bw9p@>8DwTW>^3#eiZ!F`yVw
h3@8Q^1BwB~fMP%~pcqgLC<YV*iUGxdV&MPBz`vmhs)_&r

diff --git a/css/.DS_Store b/css/.DS_Store
deleted file mode 100644
index d55ac488be245dac2d2ecdc3ae6a7f37b5552480..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%SuB*3_a1J1wp!WIbR_72Scd~S1$YkZL1)ZUZHj?_c#1c_j>YBY@P0kh$JOB
zxszn(-UFSP0Fd!|egTXC45^BuPD6CK89IpML!#ImGpw+>T6DANqA}559MX3`#vPvc
zJIA;8@1~3>E!WhScN2QRDIU;ajV0!+d&VQ5mOE<SwrY=<ec#TN*R5P#D<v6729kkf
zAQ{*{13a@;h9{0`lYwL)8TevA_lH7Ntbx6wZ5=e$0uTorHleSVX00iKHL!PNgd$!_
z^iqiyL%f{hCGu)u@95=_Xg(xX{%l^vR_FZ1(jnC`Z8DGyY%-v|FJ+|X|0Vx2%_iSc
z(j)`Pz<*^x29uk~m|quX>yPi$v$jxgsVbV+t3#o`aS7mq?jvUw^mtL9c{Q+i)LC@g
Q%87XqFhbHK1HZt)2XN6hp#T5?

diff --git a/custom/.DS_Store b/custom/.DS_Store
deleted file mode 100644
index f3e6897b29a63de75f99b9931f3a477c7bb8fcce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKF-`+P3>-s>NED=`+z)`n4^~kqsQCaSAdm>UNRa-z{3V}+vArNp7bq#vShDAK
z*51`kaXtgE`S$)2m;sp59kKH;Hs5z2*->MRNaq>nSYeA-yrCOqA11u^6dT;(5f6j<
z7hI5k!sdG2t(NO<$xL2hd*btZ*x@6^N&zV#1*Cu!kOIFb;JueNJxNrQ0#ZN<d@11H
zheCI(4g19SbTGsSK%9^c<8#as#Nq_8HtZA0&@4-dS!!*>uq-EET3&6~CuTV;Zss}d
zW@{6Q#qH!vq{C{Wq7;w<Lj{g=IrIL1MgL*`9~NmP1*E{gQotsQo5h^3)Ozda<-FGx
t`Yrv_m>cN~(Ta)Din;JseD*D`_%ruw!#**}$wxU+KLW0cObYyk0v~}19a;bY

diff --git a/header.php b/header.php
index a821fb8..cea8fe8 100755
--- a/header.php
+++ b/header.php
@@ -9,19 +9,19 @@
 	<meta charset="<?php bloginfo('charset'); ?>">
 
 	<title><?php wp_title('|', true, 'right'); bloginfo('name'); ?></title>
-	
+
 	<!-- Mobile viewport optimized: j.mp/bplateviewport -->
 	<meta name="viewport" content="width=device-width" />
-				
+
 	<!-- Favicon and Feed -->
 	<link rel="shortcut icon" type="image/png" href="<?php echo get_template_directory_uri(); ?>/favicon.png">
 	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php echo home_url(); ?>/feed/">
-	
+
 	<!--  iPhone Web App Home Screen Icon -->
 	<link rel="apple-touch-icon" sizes="72x72" href="<?php echo get_template_directory_uri(); ?>/images/devices/reverie-icon-ipad.png" />
 	<link rel="apple-touch-icon" sizes="114x114" href="<?php echo get_template_directory_uri(); ?>/images/devices/reverie-icon-retina.png" />
 	<link rel="apple-touch-icon" href="<?php echo get_template_directory_uri(); ?>/images/devices/reverie-icon.png" />
-	
+
 	<!-- Enable Startup Image for iOS Home Screen Web App -->
 	<meta name="apple-mobile-web-app-capable" content="yes" />
 	<link rel="apple-touch-startup-image" href="<?php echo get_template_directory_uri(); ?>/mobile-load.png" />
@@ -32,16 +32,16 @@
 	<link rel="apple-touch-startup-image" href="<?php echo get_template_directory_uri(); ?>/images/devices/reverie-load-ipad-portrait.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)" />
 	<!-- Startup Image iPhone (320x460) -->
 	<link rel="apple-touch-startup-image" href="<?php echo get_template_directory_uri(); ?>/images/devices/reverie-load.png" media="screen and (max-device-width: 320px)" />
-	
+
 <?php wp_head(); ?>
 
 </head>
 
 <body <?php body_class(); ?>>
-	
+
 	<!-- Start the main container -->
 	<div id="container" class="container" role="document">
-		
+
 		<!-- Row for blog navigation -->
 		<div class="row">
 			<header class="twelve columns" role="banner">
@@ -51,22 +51,25 @@
 				</div>
 				<nav role="navigation">
 					<?php
-					    wp_nav_menu( array(
-						'theme_location' => 'primary_navigation',
-						'container' =>false,
-						'menu_class' => '',
-						'echo' => true,
-						'before' => '',
-						'after' => '',
-						'link_before' => '',
-						'link_after' => '',
-						'depth' => 0,
-						'items_wrap' => '<ul class="nav-bar">%3$s</ul>',
-						'walker' => new reverie_walker())
-					); ?>
+						if ( has_nav_menu( 'primary_navigation' ) ):
+					    	wp_nav_menu( array(
+								'theme_location' => 'primary_navigation',
+								'container' =>false,
+								'menu_class' => '',
+								'echo' => true,
+								'before' => '',
+								'after' => '',
+								'link_before' => '',
+								'link_after' => '',
+								'depth' => 0,
+								'items_wrap' => '<ul class="nav-bar">%3$s</ul>',
+								'walker' => new reverie_walker())
+							);
+						endif;
+						?>
 				</nav>
 			</header>
 		</div>
-		
+
 		<!-- Row for main content area -->
 		<div id="main" class="row">
\ No newline at end of file
diff --git a/images/.DS_Store b/images/.DS_Store
deleted file mode 100644
index f1822c84a9656b1afdebead1c34f1ff9f67455fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12292
zcmeI1L2DC16vyAB(QZ<OT%<X87(9ov2~kq;u!IWsCZy1V72WMtv#?}CcGDcvw5u1t
zjr}5?{V-niKW|1c#-fK3#l8nK|Jj*&J9$5tc{_xNRDT+`i5f)Yp%|^!QT@WqxG5`E
zaXnS2;&&X=3FXl&A4loRZ0QgJLf~H`VD|1N#n`u}l+X|RH;XXxAsVMiUikheRoSTC
zy1nUnb??s6VKR!dSwEYO;{5qwn9T-Bd=iC|7u+twVw(5E36DGriy=n1eUN1-+DC5o
zVG<X^myPZDyz94gd$+S_>3OfyZs~5Xw^-C_Uaj%oyZ2z{@zaBFezrKju<#Vl8n(Mm
zzsXxPwh&9gv6z@9v_oSW(VP7=JC0J02}fOJ7c)P9VPoeyy{3$&m>E+@1>TU+XxT@7
z#36V8cRu#)<8?0Az^(~)23V)-Gd%xMOFwM;Kf^QZN)D8+g!j&lOMP<)xP9bp-JFmm
zQXwD&{*Zt<A2f>5z-eifj}BCP1%R5*2sX6MUBdWir-9SbDn?++x<ak1a#svx-O;bz
zyufK`)w+}7mGK_8vT`>R#jB%V^K?>yRjGx55LhO#VILbN|3A6<{=e)bPeMQl{8t22
zb#JiOM@TNWt^{Xttwwo;V$94dt+ER$myWq%QgIW74P)9gpn=oUDtch@A;1`<5(4Wc
z;PQXd<$wMTSod#`^@M;B_`3wIE&n5<^K~5h{SQO5wFwUzI4!NB2PXNSF-Ro@gn$qb
d0zyCt2mv7=1cZPP5CTF#2nYcoAOx<Jz*lMEoIL;l

diff --git a/images/devices/.DS_Store b/images/devices/.DS_Store
deleted file mode 100644
index c12a05c6effc346f9410497ebd9113ea8d08c72b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOHRW;47Edrir8d>U<Gr5B5?pvRFws5cC6@6s8ZBa;Ukt=avsjW0k{O`fM<KC
z(k87~A%twn^D@rZGk!D5#6-mX$H^H{N<>|#V6um%MdZC`Ly~CO1+vB{X+~4(p&d6y
zyWuY~AbWQ}C3fuzTHn8d=DL#$8q$PLX@UOTRbGroc`<?)j!g25jlcL*(c})dM3Olk
za5CnI*BXsK5aXp5E!`Nc-T!@UH75=KoC?iGPN?P8qa2nwGQ7u`9l|=@u)0^Q?ya`E
z;~zy|V8#-8mxw(Bwyr$6S&QAw{CnlC{(Qd19J(&ffHU9>Y+(R*wn%s1&|7D~8E^)c
z49NE(Kn1gim7#t*&}az&?7*yoXQ?H`Cq&F5R)%;3VRHqVE5{Op%^mg-$7K;KLvtsN
z#RtckIaVmFvm<`c;l!Dtx6Xhwu*$%WbyK<jFE`i!t4`i?2AqL^#Q=8(*MmM%ig#-x
vIk{^C^cE^2<0`|Y3m)_;##p(EkDw~B2YCQy5i3JjApRquG<f3-{3-)q@uh#K

diff --git a/images/foundation/.DS_Store b/images/foundation/.DS_Store
deleted file mode 100644
index 7ab2849ecd8fb2e94721b52e028551928458d0a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5T3QIZvBB=gdP{qMbc8mgNG0*cobUb!HOnCXrMHuN$H_RgBKsixAA$L
z*<B04(4&aX!0tCYKf9X`vbzHS!e2%m00#ghHbOy4g^;<@wPS+?A~u{O3s>npoF-w#
zG{4hCdv8Dj3kV@D?f*TTPvbOm-4C%-t2cJ{q}-Q><54_|l9it<XHj}Pm?Wz~96g4?
z;!f*XkS$X`SZL2pkWJ8|^<k1sQ6JmrQ5<EHd#ANt_qv_7>h|2ct=1Rrd0U-z+&phK
zWz%_+$0w(k*Tdi`e|{+pe}Xnla%5oBziu>Em;q*h8DIvOfvpVKt3)1bjbbM=zzqCH
z2IzcH*a$s~g+YCEV5ds}#5$U_piZ>}<tU4u#lj$ZP=rZEG^xUt7{a8ZUD-I#Vqwsv
zgU~DEJa*-;;zj7y(XMnj2+tt*%m6b`W}s$<4&DD(_{&rl`Q;QIF$2uNA7en&`-8rZ
zA7$^>Z=XkZt-|(zjfCO~QczGYJpyn*=SWLCjbD+Dah}D(Ak9K{osP&40Zj;Z%)k#Y
F@CjpWLZ|=$

diff --git a/js/.DS_Store b/js/.DS_Store
deleted file mode 100644
index 6d925e26de8ea2c8925430b179008a51c78879da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOG*Pl5PcnkB#ICOQFn6zg8>gPgt%~>3z(0hGReez1YOP2)8q!;E4%orx)IZv
zY(+v<sCqr!U2m%2Fw<!OuDuwxfChjXU9ft@P+~GJzGaorBZE#kUNF1M@<Bh#`&+ZE
z!xS(D{+j~w?jE9t34cv&zQ6n^xcYj%{-V>g^fS(R#R3nQ;++`-wr7|l#|V#%Q{t?Y
zX-SITOeYc32+tUoWmdXTW?X~Zwa@H1uFxXG4gI>5X%#VDMm0>3QHudr_r$ei80tEk
zT+@!)T%D?Xl9i_VG$O_+8Q$nUvX$w(jPg&Td{I^^nX`gPxw4gR#Bt7g^HBSkc^}lL
zsZVD?g@>#~*zz4}uOc>GmW4f3fP1!B?bxG5Q@|831%4Ee??XZtOam4k_0z$iM*w1#
z-D+&hSweD>fN8+OBS&b?rxJat3r7s+)7hVdd1=7HqfdtmhYuI-?7|7f>D|en=ybT$
zqeWA|6xdYYz+X0G|G(XR{@+ZpD^tJ}*eeBGwbSjixumeSZY@ss+Jt^j7n6B~M@?Y}
h+p#ueE54wsaV(JrF%4LFWDm{$2&fDeOo2aD;2QvtrE>rP