Skip to content

Commit

Permalink
mod_rewrite rules for *.html, plus created empty ritverktyg page
Browse files Browse the repository at this point in the history
  • Loading branch information
frebro committed Dec 3, 2013
1 parent 4055df3 commit 2336a5b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
10 changes: 9 additions & 1 deletion src/.htaccess
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<IfModule mod_rewrite.c>

RewriteEngine On
RewriteBase /

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d

RewriteRule ^data/(.*)$ http://platsbyggdbokhylla.talkative.se/$1.json [P,L]

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME}.html -f
RewriteRule ^(.+)$ $1.html [L,QSA]

</IfModule>
22 changes: 11 additions & 11 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
<div class="hidden-xs col-sm-4 col-md-3">
<nav class="btn-group pull-right">
<a class="btn btn-info" href="/">Startsida</a>
<a class="btn btn-default" href="/planner.html">Ritverktyg</a>
<a class="btn btn-default" href="/ritverktyg">Ritverktyg</a>
</nav>
</div>
</div>
Expand All @@ -49,7 +49,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
/
<span class="price-period">24 mån</span>
</small>
<a class="btn btn-info" data-planid="51e9078a15fbf2ba31000033" href="#planner" title="Börja rita den här hyllan">
<a class="btn btn-info" href="/planner/51e9078a15fbf2ba31000033" title="Börja rita den här hyllan">
<span class="hidden-xs">Rita den här hyllan</span>
<span class="visible-xs">Rita</span>
</a>
Expand All @@ -67,7 +67,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
/
<span class="price-period">24 mån</span>
</small>
<a class="btn btn-info" data-planid="51ee4dc915fbf2ba31000046" href="#planner" title="Börja rita den här hyllan">
<a class="btn btn-info" href="/planner/51ee4dc915fbf2ba31000046" title="Börja rita den här hyllan">
<span class="hidden-xs">Rita den här hyllan</span>
<span class="visible-xs">Rita</span>
</a>
Expand All @@ -85,7 +85,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
/
<span class="price-period">24 mån</span>
</small>
<a class="btn btn-info" data-planid="51e9078a15fbf2ba31000033" href="#planner" title="Börja rita den här hyllan">
<a class="btn btn-info" href="/planner/51e9078a15fbf2ba31000033" title="Börja rita den här hyllan">
<span class="hidden-xs">Rita den här hyllan</span>
<span class="visible-xs">Rita</span>
</a>
Expand All @@ -103,7 +103,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
/
<span class="price-period">24 mån</span>
</small>
<a class="btn btn-info" data-planid="51e90d8d15fbf2ba31000037" href="#planner" title="Börja rita den här hyllan">
<a class="btn btn-info" href="/planner/51e90d8d15fbf2ba31000037" title="Börja rita den här hyllan">
<span class="hidden-xs">Rita den här hyllan</span>
<span class="visible-xs">Rita</span>
</a>
Expand All @@ -129,7 +129,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
/
<span class="price-period">24 mån</span>
</small>
<a class="btn btn-info" data-planid="51e90d8d15fbf2ba31000037" href="#planner" title="Börja rita den här hyllan">
<a class="btn btn-info" href="/planner/51e90d8d15fbf2ba31000037" title="Börja rita den här hyllan">
<span class="hidden-xs">Rita den här hyllan</span>
<span class="visible-xs">Rita</span>
</a>
Expand All @@ -147,7 +147,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
/
<span class="price-period">24 mån</span>
</small>
<a class="btn btn-info" data-planid="51e90b2415fbf2ba31000034" href="#planner" title="Börja rita den här hyllan">
<a class="btn btn-info" href="/planner/51e90b2415fbf2ba31000034" title="Börja rita den här hyllan">
<span class="hidden-xs">Rita den här hyllan</span>
<span class="visible-xs">Rita</span>
</a>
Expand Down Expand Up @@ -181,7 +181,7 @@ <h1 class="text-center emphasize text-muted">
</div>
<div class="row">
<div class="col-sm-4 col-sm-offset-4 row-before-2">
<a class="btn btn-info btn-block btn-lg" href="#planner">Börja rita din bokhylla</a>
<a class="btn btn-info btn-block btn-lg" href="/planner">Börja rita din bokhylla</a>
<p class="text-center row-before-1">
Vi levererar både i Sverige och Danmark.
</p>
Expand Down Expand Up @@ -232,7 +232,7 @@ <h1 class="col-sm-12 text-center row-before-2 row-after-2">Bokhyllan Ribersborg<
<figure class="col-sm-12">
<img class="img-responsive center-block" src="images/drawing-ribersborg2.png" alt="Ribersborg">
<figcaption class="col-sm-4 col-sm-offset-4 row-before-1 row-after-1">
<a href="#planner" class="btn btn-block btn-info" data-template="standard" data-model="ribersborg">Börja rita Ribersborg</a>
<a href="/planner" class="btn btn-block btn-info">Börja rita Ribersborg</a>
</figcaption>
</figure>
</div>
Expand Down Expand Up @@ -263,7 +263,7 @@ <h1 class="col-sm-12 text-center row-before-2 row-after-2">Bokhyllan Davidhall</
<figure class="col-sm-12">
<img class="img-responsive center-block" src="images/drawing-davidhall2.png" alt="Davidhall">
<figcaption class="col-sm-4 col-sm-offset-4 row-before-1 row-after-1">
<a href="#planner" class="btn btn-block btn-info" data-template="standard" data-model="davidhall">Börja rita Davidhall</a>
<a href="/planner" class="btn btn-block btn-info">Börja rita Davidhall</a>
</figcaption>
</figure>
</div>
Expand Down Expand Up @@ -301,7 +301,7 @@ <h1 class="col-sm-12 text-center row-before-2 row-after-2">Bokhyllan Sofielund</
<figure class="col-sm-12">
<img class="img-responsive center-block" src="images/drawing-sofielund2.png" alt="Sofielund">
<figcaption class="col-sm-4 col-sm-offset-4 row-before-1 row-after-1">
<a href="#planner" class="btn btn-block btn-info" data-template="standard" data-model="sofielund">Börja rita Sofielund</a>
<a href="/planner" class="btn btn-block btn-info">Börja rita Sofielund</a>
</figcaption>
</figure>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/planner.html → src/ritverktyg.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Platsbyggd bokhylla <small class="text-muted">av Jerker Inredning &amp; Form
<div class="hidden-xs col-sm-4 col-md-3">
<nav class="btn-group pull-right">
<a class="btn btn-default" href="/">Startsida</a>
<a class="btn btn-info" href="/planner.html">Ritverktyg</a>
<a class="btn btn-info" href="/ritverktyg">Ritverktyg</a>
</nav>
</div>
</div>
Expand Down

0 comments on commit 2336a5b

Please sign in to comment.