From a5873fab017f8520b82ae68410add011ccd1f256 Mon Sep 17 00:00:00 2001
From: Saivann <saivann@gmail.com>
Date: Wed, 11 Dec 2013 19:26:13 -0500
Subject: [PATCH] Move trademark icons to a seperate folder

---
 COPYING                                       |   1 +
 _templates/choose-your-wallet.html            |  26 +++++++++---------
 _templates/download.html                      |  14 +++++-----
 img/{dow-android.png => os/android.png}       | Bin
 img/{dow-blackberry.png => os/blackberry.png} | Bin
 img/{dow-ios.png => os/ios.png}               | Bin
 img/{dow-linux.png => os/linux.png}           | Bin
 img/{dow-osx-uni.png => os/osx-uni.png}       | Bin
 img/{dow_sig.png => os/sig.png}               | Bin
 img/{dow_sig.svg => os/sig.svg}               |   0
 img/{dow-ubuntu.png => os/ubuntu.png}         | Bin
 img/{dow-win.png => os/win.png}               | Bin
 12 files changed, 21 insertions(+), 20 deletions(-)
 rename img/{dow-android.png => os/android.png} (100%)
 rename img/{dow-blackberry.png => os/blackberry.png} (100%)
 rename img/{dow-ios.png => os/ios.png} (100%)
 rename img/{dow-linux.png => os/linux.png} (100%)
 rename img/{dow-osx-uni.png => os/osx-uni.png} (100%)
 rename img/{dow_sig.png => os/sig.png} (100%)
 rename img/{dow_sig.svg => os/sig.svg} (100%)
 rename img/{dow-ubuntu.png => os/ubuntu.png} (100%)
 rename img/{dow-win.png => os/win.png} (100%)

diff --git a/COPYING b/COPYING
index 219833c0..43bd8c66 100644
--- a/COPYING
+++ b/COPYING
@@ -4,3 +4,4 @@ img/clients
 img/faq
 img/innovation
 img/press
+img/os
diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html
index bbb3ead5..b8767d56 100755
--- a/_templates/choose-your-wallet.html
+++ b/_templates/choose-your-wallet.html
@@ -22,7 +22,7 @@ id: choose-your-wallet
   <div>
     <div>
       <h2>Bitcoin Wallet</h2>
-      <span><img src="/img/dow-android.png" alt="Android" title="Android" /><img src="/img/dow-blackberry.png" alt="BlackBerry OS" title="BlackBerry OS" /></span>
+      <span><img src="/img/os/android.png" alt="Android" title="Android" /><img src="/img/os/blackberry.png" alt="BlackBerry OS" title="BlackBerry OS" /></span>
       <p>{% translate walletbitcoinwallet %}</p>
       <p><a href="https://play.google.com/store/apps/details?id=de.schildbach.wallet">{% translate walletvisit %}</a></p>
     </div>
@@ -89,7 +89,7 @@ id: choose-your-wallet
   <div>
     <div>
       <h2>Bitcoin-Qt</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
       <p>{% translate walletbitcoinqt %}</p>
       <p>{% translate walletdownload %}</p>
     </div>
@@ -100,7 +100,7 @@ id: choose-your-wallet
   <div>
     <div>
       <h2>MultiBit</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
       <p>{% translate walletmultibit %}</p>
       <p><a href="https://multibit.org/">{% translate walletvisit %}</a></p>
     </div>
@@ -111,7 +111,7 @@ id: choose-your-wallet
   <div>
     <div>
       <h2>Armory</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /></span>
       <p>{% translate walletarmory %}</p>
       <p><a href="http://bitcoinarmory.com/">{% translate walletvisit %}</a></p>
     </div>
@@ -124,7 +124,7 @@ id: choose-your-wallet
   <div>
     <div>
       <h2>Electrum</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/dow-android.png" alt="Android" title="Android" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/os/android.png" alt="Android" title="Android" /></span>
       <p>{% translate walletelectrum %}</p>
       <p><a href="http://electrum.org/">{% translate walletvisit %}</a></p>
     </div>
@@ -215,7 +215,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Bitcoin-Qt</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
       <p class="hyphenate">{% translate walletbitcoinqt %}</p>
       <p>{% translate walletdownload %}</p>
     </div>
@@ -228,7 +228,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>MultiBit</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /></span>
       <p class="hyphenate">{% translate walletmultibit %}</p>
       <p><a href="https://multibit.org/">{% translate walletvisit %}</a></p>
     </div>
@@ -241,7 +241,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Armory</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /></span>
       <p class="hyphenate">{% translate walletarmory %}</p>
       <p><a href="http://bitcoinarmory.com/">{% translate walletvisit %}</a></p>
     </div>
@@ -256,7 +256,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Electrum</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/dow-android.png" alt="Android" title="Android" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/os/android.png" alt="Android" title="Android" /></span>
       <p class="hyphenate">{% translate walletelectrum %}</p>
       <p><a href="http://electrum.org/">{% translate walletvisit %}</a></p>
     </div>
@@ -287,7 +287,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Bitcoin Wallet</h2>
-      <span><img src="/img/dow-android.png" alt="Android" title="Android" /><img src="/img/dow-blackberry.png" alt="BlackBerry OS" title="BlackBerry OS" /></span>
+      <span><img src="/img/os/android.png" alt="Android" title="Android" /><img src="/img/os/blackberry.png" alt="BlackBerry OS" title="BlackBerry OS" /></span>
       <p class="hyphenate">{% translate walletbitcoinwallet %}</p>
       <p><a href="https://play.google.com/store/apps/details?id=de.schildbach.wallet">{% translate walletvisit %}</a></p>
     </div>
@@ -412,7 +412,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Electrum</h2>
-      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/dow-android.png" alt="Android" title="Android" /></span>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/os/android.png" alt="Android" title="Android" /></span>
       <p class="hyphenate">{% translate walletelectrum %}</p>
       <p><a href="http://electrum.org/">{% translate walletvisit %}</a></p>
     </div>
@@ -428,7 +428,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Mycelium Wallet</h2>
-      <span><img src="/img/dow-android.png" alt="Android" title="Android" /></span>
+      <span><img src="/img/os/android.png" alt="Android" title="Android" /></span>
       <p class="hyphenate">{% translate walletmyceliumwallet %}</p>
       <p><a href="https://play.google.com/store/apps/details?id=com.mycelium.wallet">{% translate walletvisit %}</a></p>
     </div>
@@ -442,7 +442,7 @@ id: choose-your-wallet
     <div class="b1"></div>
     <div class="b2">
       <h2>Blockchain.info</h2>
-      <span><img src="/img/dow-android.png" alt="Android" title="Android" /><img src="/img/dow-ios.png" alt="iOS" title="iOS" /></span>
+      <span><img src="/img/os/android.png" alt="Android" title="Android" /><img src="/img/os/ios.png" alt="iOS" title="iOS" /></span>
       <p class="hyphenate">{% translate walletblockchaininfomob %}</p>
       <p><a href="https://blockchain.info/wallet/">{% translate walletvisit %}</a></p>
     </div>
diff --git a/_templates/download.html b/_templates/download.html
index 8aa947c5..a381fe62 100755
--- a/_templates/download.html
+++ b/_templates/download.html
@@ -9,16 +9,16 @@ id: download
   <div class="mainbutton"><a id="downloadbutton" href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe/download"><img src="/img/but_windows.svg" alt="icon">{% translate download %}</a></div>
   <div class="downloadbox">
     <p>{% translate downloados %}</p>
-    <div><img src="/img/dow-win.png" alt="windows"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32.zip/download">{% translate downloadwinzip %}</a> <small>~16MB</small></div>
-    <div id="download_windows"><img src="/img/dow-win.png" alt="windows"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe/download">{% translate downloadwinexe %}</a> <small>~12MB</small></div>
-    <div><img src="/img/dow-ubuntu.png" alt="ubuntu"> <a href="https://launchpad.net/~bitcoin/+archive/bitcoin">{% translate downloadubu %}</a> <small>~4MB</small></div>
-    <div><img src="/img/dow-linux.png" alt="linux"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-linux.tar.gz/download">{% translate downloadlin %}</a> <small>~16MB</small></div>
-    <div><img src="/img/dow-osx-uni.png" alt="osx"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg/download">{% translate downloadmac %}</a> <small>~14MB</small></div>
+    <div><img src="/img/os/win.png" alt="windows"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32.zip/download">{% translate downloadwinzip %}</a> <small>~16MB</small></div>
+    <div id="download_windows"><img src="/img/os/win.png" alt="windows"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe/download">{% translate downloadwinexe %}</a> <small>~12MB</small></div>
+    <div><img src="/img/os/ubuntu.png" alt="ubuntu"> <a href="https://launchpad.net/~bitcoin/+archive/bitcoin">{% translate downloadubu %}</a> <small>~4MB</small></div>
+    <div><img src="/img/os/linux.png" alt="linux"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-linux.tar.gz/download">{% translate downloadlin %}</a> <small>~16MB</small></div>
+    <div><img src="/img/os/osx-uni.png" alt="osx"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg/download">{% translate downloadmac %}</a> <small>~14MB</small></div>
     {% case page.lang %}
     {% when 'ar' or 'de' or 'es' or 'fa' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
-    <div><img src="/img/dow_sig.svg" alt="signature"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/SHA256SUMS.asc/view">{% translate downloadsig download en %}</a></div>
+    <div><img src="/img/os/sig.svg" alt="signature"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/SHA256SUMS.asc/view">{% translate downloadsig download en %}</a></div>
     {% else %}
-    <div><img src="/img/dow_sig.svg" alt="signature"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/SHA256SUMS.asc/view">{% translate downloadsig %}</a></div>
+    <div><img src="/img/os/sig.svg" alt="signature"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/SHA256SUMS.asc/view">{% translate downloadsig %}</a></div>
     {% endcase %}
     <div><span></span> <a href="https://github.com/bitcoin/bitcoin">{% translate downloadsource %}</a> (GitHub)</div>
     <p><a href="/en/version-history">{% translate versionhistory %}</a></p>
diff --git a/img/dow-android.png b/img/os/android.png
similarity index 100%
rename from img/dow-android.png
rename to img/os/android.png
diff --git a/img/dow-blackberry.png b/img/os/blackberry.png
similarity index 100%
rename from img/dow-blackberry.png
rename to img/os/blackberry.png
diff --git a/img/dow-ios.png b/img/os/ios.png
similarity index 100%
rename from img/dow-ios.png
rename to img/os/ios.png
diff --git a/img/dow-linux.png b/img/os/linux.png
similarity index 100%
rename from img/dow-linux.png
rename to img/os/linux.png
diff --git a/img/dow-osx-uni.png b/img/os/osx-uni.png
similarity index 100%
rename from img/dow-osx-uni.png
rename to img/os/osx-uni.png
diff --git a/img/dow_sig.png b/img/os/sig.png
similarity index 100%
rename from img/dow_sig.png
rename to img/os/sig.png
diff --git a/img/dow_sig.svg b/img/os/sig.svg
similarity index 100%
rename from img/dow_sig.svg
rename to img/os/sig.svg
diff --git a/img/dow-ubuntu.png b/img/os/ubuntu.png
similarity index 100%
rename from img/dow-ubuntu.png
rename to img/os/ubuntu.png
diff --git a/img/dow-win.png b/img/os/win.png
similarity index 100%
rename from img/dow-win.png
rename to img/os/win.png