Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/issues 30 19 merge new with old #35

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Feature/issues 30 19 merge new with old #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b774d87
Prioritize index.html over index.php to make 2015 static site work.
timwood Mar 7, 2016
a3af26c
Static pages for 2015 site.
timwood Mar 7, 2016
5593624
Restored 2015 custom theme, custom features, contrib libraries and co…
timwood Mar 7, 2016
3671ab5
Merge branch 'develop' into feature/issues-30-19-merge-new-with-old
timwood Mar 19, 2016
3a41e44
Removed old wget static copy of 2015 site and added static copy gener…
timwood Mar 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
44 changes: 27 additions & 17 deletions docroot/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Options +FollowSymLinks
ErrorDocument 404 /index.php

# Set the default handler.
DirectoryIndex index.php index.html index.htm
DirectoryIndex index.html index.htm index.php

# Override PHP settings that cannot be changed at runtime. See
# sites/default/default.settings.php and drupal_environment_initialize() in
Expand Down Expand Up @@ -109,24 +109,34 @@ DirectoryIndex index.php index.html index.htm
# uncomment the following line:
# RewriteBase /


## Could not get this working well for a subdomain, so just add the site code to the repo at it's old path and get rid of all this junk.
# # Specifically redirect last year page.
# #RewriteCond %{HTTP_HOST} !2015\.drupalgovcon\.org$
# #RewriteRule ^drupal-govcon-2015(|/.*)$ http://2015.drupalgovcon.org/index.html [R=301,L]
#
# # Only serve the static site for a particular host.
# #RewriteCond %{HTTP_HOST} ^2015\.drupalgovcon\.org$
# # Don't loop anything targeting the actual mask directory, to allow
# # for linked scripts, stylesheets etc in the static HTML
# #RewriteCond %{REQUEST_URI} !^/2015\.drupalgovcon\.org(|/.*) [NC]
# #Any requests that made it this far are served from the /static/ directory
# #RewriteRule ^drupal-govcon-2015(|/.*)$ /2015.drupalgovcon.org/$1 [R,L]
##
# Don't loop anything targeting the actual mask directory or old site static directory, to allow
# for linked scripts, stylesheets etc in the static HTML
RewriteCond %{REQUEST_URI} !/splash-page(|/.*) [NC]
RewriteCond %{REQUEST_URI} !^/2015(|/.*) [NC]
# Any requests that made it this far are redirected to the splash-page directory
RewriteRule ^(.*)$ /splash-page/ [R=302,L]

# Drupal default stuff
# Pass all requests not referring directly to files in the filesystem to
# index.php. Clean URLs are handled in drupal_environment_initialize().
# RewriteCond %{REQUEST_FILENAME} !-f
# RewriteCond %{REQUEST_FILENAME} !-d
# RewriteCond %{REQUEST_URI} !=/favicon.ico
# RewriteRule ^ index.php [L]

# Instead of any of these, serve static html site from subdir.
RewriteCond %{HTTP_HOST} ^(www.|)(drupalgovcon|capitalcamp|drupalgovdays|drupalforgov|capitalcampandgovdays|capitalcamp.prod.acquia-sites)(.org|.com) [NC]

# Specifically redirect last year page.
RewriteRule ^drupal-govcon-2015$ /splash-page/$1 [R=301,L]

# Don't loop anything targeting the actual mask directory, to allow
# for linked scripts, stylesheets etc in the static HTML
RewriteCond %{REQUEST_URI} !^/splash-page/
#Any requests that made it this far are served from the /static/ directory
RewriteRule ^(.*)$ /splash-page/$1 [PT]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_URI} !=/favicon.ico
RewriteRule ^ index.php [L]

# Rules to correctly serve gzip compressed CSS and JS files.
# Requires both mod_rewrite and mod_headers to be enabled.
Expand Down
181 changes: 181 additions & 0 deletions docroot/2015/1-2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<!DOCTYPE html>
<!--[if IEMobile 7]><html class="no-js ie iem7" lang="en" dir="ltr"><![endif]-->
<!--[if lte IE 6]><html class="no-js ie lt-ie9 lt-ie8 lt-ie7" lang="en" dir="ltr"><![endif]-->
<!--[if (IE 7)&(!IEMobile)]><html class="no-js ie lt-ie9 lt-ie8" lang="en" dir="ltr"><![endif]-->
<!--[if IE 8]><html class="no-js ie lt-ie9" lang="en" dir="ltr"><![endif]-->
<!--[if (gte IE 9)|(gt IEMobile 7)]><html class="no-js ie" lang="en" dir="ltr"><![endif]-->
<!--[if !IE]><!--><html class="no-js" lang="en" dir="ltr"><!--<![endif]-->

<!-- Mirrored from 2015.drupalgovcon.org/comment/1 by HTTrack Website Copier/3.x [XR&CO'2014], Sat, 19 Mar 2016 22:55:16 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
<head>
<meta charset="utf-8" />
<meta http-equiv="cleartype" content="on" />
<link rel="apple-touch-icon-precomposed" href="images/apple-touch-icon-precomposed-114x114.png" sizes="114x114" />
<link rel="apple-touch-icon-precomposed" href="images/apple-touch-icon-precomposed-144x144.png" sizes="144x144" />
<link rel="apple-touch-icon-precomposed" href="images/apple-touch-icon-precomposed.png" />
<link rel="apple-touch-icon-precomposed" href="images/apple-touch-icon-precomposed-72x72.png" sizes="72x72" />
<meta name="MobileOptimized" content="width" />
<meta name="HandheldFriendly" content="true" />
<link rel="canonical" href="welcome.html" />
<meta name="Generator" content="Drupal 7 (http://drupal.org)" />
<link rel="shortlink" href="161-2.html" />
<link rel="shortcut icon" href="images/favicon.ico" type="image/vnd.microsoft.icon" />
<link rel="profile" href="http://www.w3.org/1999/xhtml/vocab" />
<meta name="viewport" content="width=device-width" />
<title>Welcome! | Drupal GovCon</title>
<link type="text/css" rel="stylesheet" href="images/css_ylfzjrwmg-am0j37qgoqr1hu5vqyqe1sznhhzu4td3g.css" media="all" />
<link type="text/css" rel="stylesheet" href="images/css_gzdxmb2ywxzt2iwry3uryjsfqg2o1gtbt1jp03s0vlm.css" media="all" />
<link type="text/css" rel="stylesheet" href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,900,300italic,400italic,600italic,700italic,900italic" media="all" />
<link type="text/css" rel="stylesheet" href="images/css8648.css?family=Courgette" media="all" />
<link type="text/css" rel="stylesheet" href="images/css_7_1btmwg_fbcwjm8w-379sncndsmdz1n68wexwjdiwg.css" media="all" />

<!--[if lte IE 8]>
<link type="text/css" rel="stylesheet" href="http://2015.drupalgovcon.org/sites/2015.drupalgovcon.org/files/css/css_p_pL5l0BSnSmpIpuUJ_N_YEvi8Xo6aZic6U5fdL8BJM.css" media="all" />
<![endif]-->
<link type="text/css" rel="stylesheet" href="images/css_wy5kxdoc8zfpnu4bgc8hxsrivtinvt7tdbicb7d9hzo.css" media="all" />

<!--[if lte IE 8]>
<link type="text/css" rel="stylesheet" href="http://2015.drupalgovcon.org/sites/2015.drupalgovcon.org/files/css/css_UtHaHxlK9sBNjdXsuSyntkGPD3GQ2zfU_4a4P8JiRQY.css" media="all" />
<![endif]-->
<script src="images/modernizr.custom.10016e9e4.js?o4asmd"></script>
<script src="images/js_zcr7qdjwujtas6pdawwq_ozep2peyym12ml-zvtjxao.js"></script>
<script src="images/js_qe4kfygjty9x7gyqzjmp9mcdig6pqcqqjbfsbu7bk8w.js"></script>
<script src="images/js_ykqfkq8tipwhejf3awnotygqeiivxwoqpwb_sguq5su.js"></script>

<!--[if (gte IE 6)&(lte IE 8)]>
<script src="http://2015.drupalgovcon.org/sites/2015.drupalgovcon.org/files/js/js_1H0BagV0_yWBCoyD6G9pQzg9T5T5Wv2lSk0YbPgykMU.js"></script>
<![endif]-->
<script src="images/js_i8yx6rypzb7atmcdua3qkdzqvkven35ed11_1i7vvpc.js"></script>
<script>(function(i,s,o,g,r,a,m){i["GoogleAnalyticsObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,"script","http://www.google-analytics.com/analytics.js","ga");ga("create", "UA-58518592-2", {"cookieDomain":"auto"});ga("set", "anonymizeIp", true);ga("set", "page", location.pathname + location.search + location.hash);ga("send", "pageview");</script>
<script src="images/js_msvbuwufavw_ffbcf5qjyjfqm1zcyrccem4e3_6vqla.js"></script>
<script>jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","back_to_top":{"back_to_top_button_trigger":100,"back_to_top_prevent_on_mobile":true,"back_to_top_prevent_in_admin":true,"back_to_top_button_type":"image","back_to_top_button_text":"Back to top","#attached":{"library":[["system","ui"]]}},"responsive_dropdown_menus":{"devel":"Development","features":"Features","main-menu":"Main menu","management":"Management","navigation":"Navigation","menu-menu-quick-links":"Quick links - Authenticated","user-menu":"User menu"},"googleanalytics":{"trackOutbound":1,"trackMailto":1,"trackDownload":1,"trackDownloadExtensions":"7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip","trackUrlFragments":1}});</script>
</head>
<body class="html not-front not-logged-in page-node page-node- page-node-161 node-type-news section-drupal-govcon-2015">
<a href="#main-content" class="element-invisible element-focusable">Skip to main content</a>
<div class="l-page has-no-sidebars">
<header class="l-header" role="banner">
<div class="header-bg">
<div class="header-bg--buildings"></div>
<div class="header-bg--cutout"></div>
</div>
<div class="l-region l-region--navigation">
<div id="block-responsive-dropdown-menus-main-menu" class="block block--responsive-dropdown-menus block--responsive-dropdown-menus-main-menu">
<div class="block__content">
<ul id="main-menu" class="main-menu responsive-menu links"><li id="menu-item-9276" class="menu-item menu-parent menu-item-primary first"><a href="about.html">About</a><ul class="sub-menu tier-two"><li id="menu-item-20375" class="menu-item menu-item-secondary first"><a href="contact-us.html">Contact Us</a></li>
<li id="menu-item-18771" class="menu-item menu-item-secondary"><a href="accessibility.html">Accessibility</a></li>
<li id="menu-item-9281" class="menu-item menu-item-secondary"><a href="travel-and-directions.html">Travel and Directions</a></li>
<li id="menu-item-9301" class="menu-item menu-item-secondary"><a href="where-stay.html">Where to Stay</a></li>
<li id="menu-item-9306" class="menu-item menu-item-secondary"><a href="code-conduct.html">Code of Conduct</a></li>
<li id="menu-item-9311" class="menu-item menu-item-secondary"><a href="convince-your-boss.html">Convince Your Boss</a></li>
<li id="menu-item-9316" class="menu-item menu-item-secondary last"><a href="faqs.html">FAQs</a></li>
</ul></li>
<li id="menu-item-10186" class="menu-item menu-parent menu-item-primary"><a href="community.html" title="">Community</a><ul class="sub-menu tier-two"><li id="menu-item-12676" class="menu-item menu-item-secondary first"><a href="volunteering.html">Volunteering!</a></li>
<li id="menu-item-9326" class="menu-item menu-item-secondary last"><a href="meet-drupal-govcon-team.html">Meet the Drupal GovCon Team</a></li>
</ul></li>
<li id="menu-item-18736" class="menu-item menu-parent menu-item-primary"><a href="scheduleca95.html?qt-view__cod_schedule__panel_pane_1=2" title="">Schedule</a><ul class="sub-menu tier-two"><li id="menu-item-19256" class="menu-item menu-item-secondary first"><a href="mine97eb.html?qt-view__cod_schedule__my_schedule_times=2" title="">My Schedule</a></li>
<li id="menu-item-10181" class="menu-item menu-item-secondary"><a href="bofs33d1.html?qt-view__cod_bof_schedule__panel_pane_1=2" title="">BoFs</a></li>
<li id="menu-item-19721" class="menu-item menu-item-secondary"><a href="floor-layouts.html">Floor layouts</a></li>
<li id="menu-item-12671" class="menu-item menu-item-secondary last"><a href="accepted.html" title="">Accepted Sessions</a></li>
</ul></li>
<li id="menu-item-11726" class="menu-item menu-parent menu-item-primary"><a href="program.html">Program</a><ul class="sub-menu tier-two"><li id="menu-item-14331" class="menu-item menu-item-secondary first"><a href="code-sprint.html">Code Sprint</a></li>
<li id="menu-item-17501" class="menu-item menu-item-secondary"><a href="full-day-trainings.html">Full Day Trainings</a></li>
<li id="menu-item-19821" class="menu-item menu-item-secondary"><a href="mentoring.html">Mentoring</a></li>
<li id="menu-item-19191" class="menu-item menu-item-secondary"><a href="scavenger-hunt.html">Scavenger Hunt</a></li>
<li id="menu-item-18826" class="menu-item menu-item-secondary last"><a href="social-events.html">Social Events</a></li>
</ul></li>
<li id="menu-item-9806" class="menu-item menu-item-primary last"><a href="sponsors.html" title="">Sponsors</a></li>
</ul> </div>
</div>
</div>
<div class="l-constrained">
<div class="l-branding site-branding">
<a href="index.html" title="Home" rel="home" class="site-branding__logo"><img src="images/logo.png" alt="Home" /></a>
<a href="index.html" class="site-branding__name" title="Home" rel="home"><span>Drupal GovCon</span></a>
</div>
</div>
</header>



<div class="l-main l-constrained">
<a id="main-content"></a>
<h2 class="element-invisible">You are here</h2><div class="breadcrumb"><a href="index.html">Home</a></div>
<div class="l-content" role="main">
<h1>Welcome!</h1>

<article role="article" class="node node--news node--promoted node--full node--news--full">

<div class="node__posted">
Mon, 03/16/2015 - 17:39 </div>


<div class="node__content">
<div class="field field--name-body field--type-text-with-summary field--label-hidden"><div class="field__items"><div class="field__item even"><p>Registration and session submissions&nbsp;are now open! Session submissions will close on Friday, April 10th.</p></div></div></div><div class="field field--name-og-group-ref field--type-entityreference field--label-above"><div class="field__label">Conference:&nbsp;</div><div class="field__items"><div class="field__item even"><a href="index.html">Drupal GovCon 2015</a></div></div></div><div class="field field--name-field-news-tags field--type-taxonomy-term-reference field--label-above"><div class="field__label">Related Tags:&nbsp;</div><div class="field__items"><div class="field__item even"><a href="registration-2.html">Registration</a></div></div></div> </div>

<section id="comments" class="comment-wrapper comments">
<h2 class="comments__title">Comments</h2>

<a id="comment-1"></a>
<article class="comment">
<div class="comment-left">
<div class="user-picture">
<a href="timwood.html" title="View user profile."><img src="images/picture-36-1426577276a8d8.jpg?itok=GqbG00Ic" alt="timwood&#039;s picture" title="timwood&#039;s picture" /></a> </div>
</div>
<div class="comment-right">
<h3><a href="1-2.html#comment-1" class="permalink" rel="bookmark">Can&#039;t wait!</a></h3>

<p class="submitted comment__submitted"><a href="timwood.html" title="View user profile." class="username">timwood</a> Tue, 03/17/2015 - 14:06 <a href="1-2.html#comment-1" class="permalink" rel="bookmark">Permalink</a></p>

<div class="comment__content">
<div class="field field--name-comment-body field--type-text-long field--label-hidden"><div class="field__items"><div class="field__item even"><p>Should be&nbsp;awesome!</p></div></div></div> </div>
</div>

</article>

</section>
</article>
</div>

</div>

<footer class="l-footer-wrapper" role="contentinfo">
<div class="l-region l-region--footer">
<nav id="block-system-main-menu" role="navigation" class="block block--system block--menu block--system-main-menu">

<ul class="menu"><li class="first expanded"><a href="about.html">About</a><ul class="menu"><li class="first leaf"><a href="contact-us.html">Contact Us</a></li>
<li class="leaf"><a href="accessibility.html">Accessibility</a></li>
<li class="leaf"><a href="travel-and-directions.html">Travel and Directions</a></li>
<li class="leaf"><a href="where-stay.html">Where to Stay</a></li>
<li class="leaf"><a href="code-conduct.html">Code of Conduct</a></li>
<li class="leaf"><a href="convince-your-boss.html">Convince Your Boss</a></li>
<li class="last leaf"><a href="faqs.html">FAQs</a></li>
</ul></li>
<li class="expanded"><a href="community.html" title="">Community</a><ul class="menu"><li class="first leaf"><a href="volunteering.html">Volunteering!</a></li>
<li class="last leaf"><a href="meet-drupal-govcon-team.html">Meet the Drupal GovCon Team</a></li>
</ul></li>
<li class="expanded"><a href="scheduleca95.html?qt-view__cod_schedule__panel_pane_1=2" title="">Schedule</a><ul class="menu"><li class="first leaf"><a href="mine97eb.html?qt-view__cod_schedule__my_schedule_times=2" title="">My Schedule</a></li>
<li class="leaf"><a href="bofs33d1.html?qt-view__cod_bof_schedule__panel_pane_1=2" title="">BoFs</a></li>
<li class="leaf"><a href="floor-layouts.html">Floor layouts</a></li>
<li class="last leaf"><a href="accepted.html" title="">Accepted Sessions</a></li>
</ul></li>
<li class="expanded"><a href="program.html">Program</a><ul class="menu"><li class="first leaf"><a href="code-sprint.html">Code Sprint</a></li>
<li class="leaf"><a href="full-day-trainings.html">Full Day Trainings</a></li>
<li class="leaf"><a href="mentoring.html">Mentoring</a></li>
<li class="leaf"><a href="scavenger-hunt.html">Scavenger Hunt</a></li>
<li class="last leaf"><a href="social-events.html">Social Events</a></li>
</ul></li>
<li class="last leaf"><a href="sponsors.html" title="">Sponsors</a></li>
</ul></nav>
<div id="block-block-1" class="block block--block block--block-1">
<h2 class="block__title">Drupal GovCon</h2>
<div class="block__content">
<p>A community event site, powered by the <a href="https://drupal.org/project/cod">Conference Organizing Distribution</a></p> </div>
</div>
</div>
</footer>
</div>
</body>

<!-- Mirrored from 2015.drupalgovcon.org/comment/1 by HTTrack Website Copier/3.x [XR&CO'2014], Sat, 19 Mar 2016 22:55:16 GMT -->
</html>
Loading