Use Liquid Append

Also make theme-color/TileColor a variable
opengapps · Mar 23, 2016 · 4cbd4d5 · 4cbd4d5
1 parent 88798bd
commit 4cbd4d5
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 32 deletions.
diff --git a/_config.yml b/_config.yml
@@ -16,6 +16,7 @@ social:
  twitter: https://twitter.com/opengapps
  pushbullet: https://www.pushbullet.com/channel-popup?tag=
  github: https://github.com/opengapps/opengapps
+color: '#009688'
 
 support:
  faq: https://github.com/opengapps/opengapps/wiki/FAQ

diff --git a/_includes/head.html b/_includes/head.html
@@ -1,11 +1,11 @@
 <head>
 <title>{% if page.title %}{{page.title}}{% else %}{{site.title}}{% endif %}</title>
-<link rel="stylesheet" type="text/css" href="{{site.mdl}}/material.teal-red.min.css" />
+<link rel="stylesheet" type="text/css" href="{{site.mdl|append:'/material.teal-red.min.css'}}" />
 <!--Preload for fancy browsers-->
-<link rel="preload" href="{{site.gfont}}/icon?family=Material+Icons" as="style" />
-<link rel="preload" href="{{site.gfont}}/css?family=Roboto:400,400italic,500,700" as="style" />
+<link rel="preload" href="{{site.gfont|append:'/icon?family=Material+Icons'}}" as="style" />
+<link rel="preload" href="{{site.gfont|append:'/css?family=Roboto:400,400italic,500,700'}}" as="style" />
 <link rel="preload" href="{{site.jquery}}" as="script" />
-<script type="text/javascript" src="{{site.mdl}}/material.min.js"></script>
+<script type="text/javascript" src="{{site.mdl|append:'/material.min.js'}}"></script>
 <!--[if lt IE 9]>
 <script type="text/javascript" src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
@@ -57,25 +57,25 @@
 @media screen and (max-width:805px){.mdl-snackbar--active{transform:translateX(0);left:0;min-width:100%}}
 @media screen and (min-width:806px){.mdl-snackbar--active{min-width:806px}}
 </style>
-<link rel="apple-touch-icon" type="image/png" sizes="57x57" href="{{site.apimg}}57x57.png">
-<link rel="apple-touch-icon" type="image/png" sizes="60x60" href="{{site.apimg}}60x60.png">
-<link rel="apple-touch-icon" type="image/png" sizes="72x72" href="{{site.apimg}}72x72.png">
-<link rel="apple-touch-icon" type="image/png" sizes="76x76" href="{{site.apimg}}76x76.png">
-<link rel="apple-touch-icon" type="image/png" sizes="114x114" href="{{site.apimg}}114x114.png">
-<link rel="apple-touch-icon" type="image/png" sizes="120x120" href="{{site.apimg}}120x120.png">
-<link rel="apple-touch-icon" type="image/png" sizes="144x144" href="{{site.apimg}}144x144.png">
-<link rel="apple-touch-icon" type="image/png" sizes="152x152" href="{{site.apimg}}152x152.png">
-<link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{{site.apimg}}180x180.png">
-<link rel="icon" type="image/png" sizes="192x192" href="{{site.img}}android-icon-192x192.png">
-<link rel="icon" type="image/png" sizes="32x32" href="{{site.img}}favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="96x96" href="{{site.img}}favicon-96x96.png">
-<link rel="icon" type="image/png" sizes="16x16" href="{{site.img}}favicon-16x16.png">
+<link rel="apple-touch-icon" type="image/png" sizes="57x57" href="{{site.apimg|append:'57x57.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="60x60" href="{{site.apimg|append:'60x60.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="72x72" href="{{site.apimg|append:'72x72.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="76x76" href="{{site.apimg|append:'76x76.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="114x114" href="{{site.apimg|append:'114x114.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="120x120" href="{{site.apimg|append:'120x120.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="144x144" href="{{site.apimg|append:'144x144.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="152x152" href="{{site.apimg|append:'152x152.png'}}">
+<link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{{site.apimg|append:'180x180.png'}}">
+<link rel="icon" type="image/png" sizes="192x192" href="{{site.img|append:'android-icon-192x192.png'}}">
+<link rel="icon" type="image/png" sizes="32x32" href="{{site.img|append:'favicon-32x32.png'}}">
+<link rel="icon" type="image/png" sizes="96x96" href="{{site.img|append:'favicon-96x96.png'}}">
+<link rel="icon" type="image/png" sizes="16x16" href="{{site.img|append:'favicon-16x16.png'}}">
 <link rel="manifest" href="/manifest.json">
 <meta charset="utf-8">
 <meta content="chrome=1" http-equiv="X-UA-Compatible">
-<meta name="theme-color" content="#009688">
-<meta name="msapplication-TileColor" content="#009688">
-<meta name="msapplication-TileImage" content="{{site.img}}ms-icon-144x144.png">
+<meta name="theme-color" content="{{site.color}}">
+<meta name="msapplication-TileColor" content="{{site.color}}">
+<meta name="msapplication-TileImage" content="{{site.img|append:'ms-icon-144x144.png'}}">
 <meta name="apple-mobile-web-app-title" content="Open GApps">
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/_includes/header.html b/_includes/header.html
@@ -1,5 +1,5 @@
 <header class="mdl-layout__header mdl-layout__header--scroll">
- <div class="mdl-layout__header-row"><img id="logoimage" src="{{site.img}}logo.svg" alt="Open GApps logo" /></div>
+ <div class="mdl-layout__header-row"><img id="logoimage" src="{{site.img|append:'logo.svg'}}" alt="Open GApps logo" /></div>
  <div class="mdl-layout__header-row" id="toplinks">
  <div class="mdl-layout-spacer"></div>
  <nav class="mdl-navigation">

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -15,7 +15,7 @@
 <script type="text/javascript" src="{{site.jquery}}"></script>
 <script type="text/javascript">{% include scripts.js %}</script>
 <!--Fonts should not block loading the page-->
-<link rel="stylesheet" type="text/css" href="{{site.gfont}}/icon?family=Material+Icons" />
-<link rel="stylesheet" type="text/css" href="{{site.gfont}}/css?family=Roboto:400,400italic,500,700" />
+<link rel="stylesheet" type="text/css" href="{{site.gfont|append:'/icon?family=Material+Icons'}}" />
+<link rel="stylesheet" type="text/css" href="{{site.gfont|append:'/css?family=Roboto:400,400italic,500,700'}}" />
 <form id="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post"><input name="cmd" type="hidden" value="_s-xclick"><input name="encrypted" type="hidden" value="-----BEGIN PKCS7-----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-----END PKCS7-----"></form>
 </body></html>
diff --git a/browserconfig.xml b/browserconfig.xml
@@ -1,4 +1,4 @@
 ---
 ---
 <?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="{{site.img}}ms-icon-70x70.png"/><square150x150logo src="{{site.img}}ms-icon-150x150.png"/><square310x310logo src="{{site.img}}ms-icon-310x310.png"/><TileColor>#009688</TileColor></tile></msapplication></browserconfig>
+<browserconfig><msapplication><tile><square70x70logo src="{{site.img|append:'ms-icon-70x70.png'}}"/><square150x150logo src="{{site.img|append:'ms-icon-150x150.png'}}"/><square310x310logo src="{{site.img|append:'ms-icon-310x310.png'}}"/><TileColor>{{site.color}}</TileColor></tile></msapplication></browserconfig>
diff --git a/index.html b/index.html
@@ -50,7 +50,7 @@
     </tbody>
    </table>
    <table id="tv" class="dt  mdl-data-table mdl-js-data-table">
-    <thead><tr><th class="mdl-data-table__cell--non-numeric"><span id="tvariant"><a href="{{site.support.wiki}}/Package-Comparison"><strong>Variant</strong></a>:</span></th></tr></thead>
+    <thead><tr><th class="mdl-data-table__cell--non-numeric"><span id="tvariant"><a href="{{site.support.wiki|append:'/Package-Comparison'}}"><strong>Variant</strong></a>:</span></th></tr></thead>
     <tbody>
      <tr><td class="mdl-data-table__cell--non-numeric"><label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="aroma" id="laroma">
       <input id="aroma" name="variant" type="radio" value="aroma" class="mdl-radio__button" />

diff --git a/manifest.json b/manifest.json
@@ -5,37 +5,37 @@
  "name": "Open GApps",
  "icons": [
   {
-   "src": "{{site.animg}}36x36.png",
+   "src": "{{site.animg|append:'36x36.png'}}",
    "sizes": "36x36",
    "type": "image\/png",
    "density": "0.75"
   },
   {
-   "src": "{{site.animg}}48x48.png",
+   "src": "{{site.animg|append:'48x48.png'}}",
    "sizes": "48x48",
    "type": "image\/png",
    "density": "1.0"
   },
   {
-   "src": "{{site.animg}}72x72.png",
+   "src": "{{site.animg|append:'72x72.png'}}",
    "sizes": "72x72",
    "type": "image\/png",
    "density": "1.5"
   },
   {
-   "src": "{{site.animg}}96x96.png",
+   "src": "{{site.animg|append:'96x96.png'}}",
    "sizes": "96x96",
    "type": "image\/png",
    "density": "2.0"
   },
   {
-   "src": "{{site.animg}}144x144.png",
+   "src": "{{site.animg|append:'144x144.png'}}",
    "sizes": "144x144",
    "type": "image\/png",
    "density": "3.0"
   },
   {
-   "src": "{{site.animg}}192x192.png",
+   "src": "{{site.animg|append:'192x192.png'}}",
    "sizes": "192x192",
    "type": "image\/png",
    "density": "4.0"
@@ -44,5 +44,5 @@
  "start_url": "/?app=true",
  "display": "standalone",
  "orientation": "portrait",
- "theme_color": "#009688"
+ "theme_color": "{{site.color}}"
 }