Merge remote-tracking branch 'origin/master' into develop

.htaccess

@@ -3,16 +3,8 @@ RewriteEngine On
 RewriteRule ^news/$    http://newsroom.unl.edu/         [R=301]
 RewriteRule ^international/$    http://international.unl.edu/         [R=301]
 RewriteRule ^foodfuelwaterphotocontest/$    http://innovate.unl.edu/photocontest/        [R=301]
-
-RewriteCond %{REMOTE_HOST} ^129\.93 [OR]
-RewriteCond %{REMOTE_HOST} ^10\.20\. [OR]
-RewriteCond %{REMOTE_HOST} ^10\.21\. [OR]
-RewriteCond %{REMOTE_HOST} ^65\.123\.(3[2-9]|[4-5][0-9]|6[0-3])\. [OR]
-RewriteCond %{REMOTE_HOST} ^64\.39\.(24[0-9]|25[0-5])\. [OR]
-RewriteCond %{REMOTE_HOST} ^216\.218\.(20[8-9]|21[0-9]|22[0-3])\.
-RewriteCond %{REQUEST_URI} /$ [OR]
-RewriteCond %{REQUEST_URI} /index.shtml$ 
-RewriteRule (.*) http://news.unl.edu/newsrooms/unltoday/ [R=302,L]
+RewriteRule ^unltoday/$   http://news.unl.edu/newsrooms/unltoday/       [R=301]
+RewriteRule ^unltoday/index.shtml$ http://news.unl.edu/newsrooms/unltoday/      [R=301]
 
 #RewriteRule ^depts/.*$  http://directory.unl.edu/departments/academic [R=301]
 

.htaccess.root

+#---README--
+#Frontier setup:
+#  /cwis/data/index.shtml -> root/ucomm/index.shtml (symlink)
+#  /cwis/data/.htaccess -> root/ucomm/.htaccess.root (symlink)
+#
+#/cwis/data/ucomm/.htaccess contains rewirte rules that we only want applied to the ucomm directory (www.unl.edu/ucomm/), 
+#so this file (.htaccess.root) contains rules that we only want applied to the root directory (www.unl.edu) 
+
+
+
+RewriteEngine On
+
+RewriteCond %{REMOTE_HOST} ^129\.93 [OR]
+RewriteCond %{REMOTE_HOST} ^10\.20\. [OR]
+RewriteCond %{REMOTE_HOST} ^10\.21\. [OR]
+RewriteCond %{REMOTE_HOST} ^65\.123\.(3[2-9]|[4-5][0-9]|6[0-3])\. [OR]
+RewriteCond %{REMOTE_HOST} ^64\.39\.(24[0-9]|25[0-5])\. [OR]
+RewriteCond %{REMOTE_HOST} ^216\.218\.(20[8-9]|21[0-9]|22[0-3])\.
+RewriteCond %{REQUEST_URI} ^/$ [OR]
+RewriteCond %{REQUEST_URI} ^/index.shtml$ 
+RewriteRule (.*) http://news.unl.edu/newsrooms/unltoday/ [R=302,L]
\ No newline at end of file

splash/index.shtml

@@ -95,7 +95,7 @@
                         <ul class="inner">
                         		<li class="gobigPromo" id="goBigPromo">
                                  
-                              <a href="http://perlsofknowledge.unl.edu/" title="Go to the Perls of Knowledge website"><img src="/ucomm/splash/images/External_PerlsStatus.jpg" alt="Perls of Knowledge image" /></a>
+                              <a href="http://admissions.unl.edu/become/apply.aspx" title="Start your story! Apply Today."><img src="/ucomm/splash/images/promo_admissions_application.jpg" alt="Apply to the University of Nebraska-Lincoln image" /></a>
                             </li>
                         		<li class="gobigPromo" id="admissVisit">