Merge lp:~canonical-website-editors/ubuntu-partner-website/picto-update into lp:ubuntu-partner-website

[Graham Bancroft]

Wot I did:

Added missing pictograms to IOT page. Re-jig Cloud software partners section on software page to remove grey background and combine two six-cols below.

Unmerged revisions

416. By Graham Bancroft on 2015-04-17

Add pictograms to IOT page. Re-jig Cloud software partners section on software page

415. By Tristram Oaten on 2015-04-16

add proper logging

414. By Tristram Oaten on 2015-04-16

merge

413. By Tristram Oaten on 2015-04-16

Merge branch 'phone-redirect' of github.com:deadlight/ubuntu-partners into deadlight-phone-redirect

412. By Tristram Oaten on 2015-04-16

Merge pull request #30 from 0atman/always_featured_partners

Add "Always Featured" partners

411. By Karl Williams on 2015-04-14

Merge pull request #27 from deadlight/phone-redirect

redirect /partner-programmes/phone-carrier to /programmes/phone

410. By Karl Williams on 2015-04-14

Merge pull request #26 from deadlight/software-ux-tweaks

software page UX snags

409. By Tristram Oaten on 2015-04-14

Merge pull request #22 from 0atman/master

Add new `customer` type of Partner

408. By Karl Williams on 2015-04-13

Merge pull request #13 from deadlight/software

software snags

407. By Karl Williams on 2015-04-13

Merge pull request #25 from deadlight/iot-design-update

Iot design update

=== added file 'cms/static/img/iot-secure.svg'
--- cms/static/img/iot-secure.svg	1970-01-01 00:00:00 +0000
+++ cms/static/img/iot-secure.svg	2015-04-17 09:47:18 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="595.3px" height="530.3px" viewBox="0 158.3 595.3 530.3" enable-background="new 0 158.3 595.3 530.3"
+	 xml:space="preserve">
+<g>
+	<path fill="#F7F7F7" d="M413.8,633h-279c-46.3,0-83.7-37.4-83.7-83.7c0-44.4,34.7-80.8,78.5-83.5c-19.6-39.3-5.4-87.4,33.1-109.8
+		s87.4-10.3,111.6,26.3c24.2-36.6,73.2-48.6,111.6-26.3s52.7,70.5,33.1,109.8c43.8,2.7,78.5,39.1,78.5,83.5
+		C497.5,595.6,459.9,633,413.8,633z"/>
+</g>
+<g>
+	<path fill="#DE4815" d="M483.7,542.9H111.6C50,542.9,0,492.9,0,431.3C0,372,46.3,323.4,104.8,319.9c-26.3-52.5-7.4-116.8,44-146.5
+		c51.5-29.6,116.6-13.8,148.8,34.9c32.2-48.8,97.4-64.7,148.8-34.9s70.3,94,44,146.3c58.5,3.5,104.8,52.1,104.8,111.4
+		C595.3,492.9,545.3,542.9,483.7,542.9z"/>
+</g>
+<g>
+	<path fill="#5E2750" d="M524.4,688.6h-186c-30.8,0-55.8-25-55.8-55.8c0-29.8,23.1-53.9,52.3-55.6c-13-26.3-3.7-58.3,22.1-73.2
+		c25.6-14.9,58.3-6.8,74.4,17.6c16.1-24.4,48.8-32.2,74.4-17.6c25.6,14.9,35.1,46.9,22.1,73.2c29.1,1.9,52.3,26,52.3,55.6
+		C580.2,663.6,555.2,688.6,524.4,688.6z"/>
+</g>
+<g id="_x31_8">
+	<path fill="#FFFFFF" d="M244.6,353.3c0-32,26.1-58.1,58.1-58.1c32,0,58.1,26.1,58.1,58.1h19.4c0-42.7-34.8-77.5-77.5-77.5
+		c-42.7,0-77.5,34.7-77.5,77.5v19.4v9.7v0.3h0c0.1,42.6,34.8,77.2,77.5,77.2c42.7,0,77.5-34.8,77.5-77.5v-9.7H244.6V353.3z
+		 M302.6,387.2c8,0,14.5,6.5,14.5,14.5c0,6.3-4,11.7-9.7,13.7v25c0,2.7-2.2,4.8-4.8,4.8c-2.7,0-4.8-2.2-4.8-4.8v-25
+		c-5.6-2-9.7-7.4-9.7-13.7C288.1,393.7,294.6,387.2,302.6,387.2z"/>
+</g>
+</svg>

=== modified file 'templates/programmes/iot.html'
--- templates/programmes/iot.html	2015-04-14 16:45:28 +0000
+++ templates/programmes/iot.html	2015-04-17 09:47:18 +0000
@@ -27,12 +27,19 @@
 		<h2>One platform from cloud to device</h2>
 		<p>The Snappy Ubuntu Core on smart devices delivers bullet-proof security, reliable updates and the enormous Ubuntu ecosystem at your fingertips &ndash; bringing the developer&rsquo;s favourite cloud platform to a wide range of internet things, connected devices and autonomous machines.</p>
 	</div>
+	<div class="four-col last-col">
+  	<img class="priority-0" src="{{ STATIC_URL }}img/iot-secure.png" alt="" width="200" />
+	</div>
 </section>
 
 <section class="row">
-	<div class="four-col">
+	<div class="five-col align-center">
+  	<ul class="no-bullets inline">
+    	<li class="two-col"><img src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-engineering-midaubergine.svg" alt="" class="priority-0" width="120" /></li>
+      <li class="two-col last-col"><img src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-shop-warmgrey.svg" alt="" class="priority-0" width="120" /></li>
+  	</ul>
 	</div>
-	<div class="eight-col last-col">
+	<div class="seven-col last-col">
 		<h2>A marketplace for incredible apps</h2>
 		<p>General-purpose, extensible devices like hubs, set-top boxes and gateways create a market for apps from a global developer community. Ubuntu makes it easy to develop amazing apps for incredible devices on your laptop, test on the cloud and publish straight to a global market of diverse devices.</p>
 	</div>

=== modified file 'templates/programmes/software.html'
--- templates/programmes/software.html	2015-04-16 13:29:58 +0000
+++ templates/programmes/software.html	2015-04-17 09:47:18 +0000
@@ -16,7 +16,7 @@
 		<p>We offer a range of benefits for ISVs looking to formalise their work with Ubuntu, through Canonical. As a certified partner, you&rsquo;ll get inside information on forthcoming Ubuntu developments, assistance in testing and optimising your applications with Ubuntu and OpenStack &mdash; and priority access to Ubuntu engineers.</p>
 		<p><a href="/contact-us">Talk to us about becoming a partner&nbsp;&rsaquo;</a></p>
 	</div>
-	<img class="priority-0" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/phone/scopes/image-scopes.jpg" alt="scopes">
+	<img class="priority-0" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/phone/scopes/image-scopes.jpg" alt="scopes" />
 </section>
 
 {% include "block/_logo-list.html" with name="software partners" query="programme=openstack&amp;service-offered=softwarecontent-publisher" %}
@@ -29,7 +29,7 @@
 			<p><a href="https://developer.ubuntu.com/en/start/ubuntu-sdk/installing-the-sdk/" class="external">Learn more about Ubuntu SDK</a></p>
 		</div>
 		<div class="four-col last-col align-center align-vertically">
-			<img class="priority-0" width="150" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-developer-warmgrey.svg" alt="developer pictogram">
+			<img class="priority-0" width="150" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-developer-warmgrey.svg" alt="developer pictogram" />
 		</div>
 	</div>
 </section>
@@ -51,36 +51,36 @@
 	<p><a href="https://design.ubuntu.com/apps" class="external">Explore our App Design Guide</a></p>
 </section>
 
-<section class="row row-grey">
-	<div class="equal-height">
+<section class="row">
+	<div class="twelve-col equal-height">
 		<div class="eight-col no-margin-bottom">
 			<h2>Cloud software partners</h2>
 			<p>Ubuntu is the world&rsquo;s leading cloud operating system, both as a guest on public clouds &mdash; like Amazon and Windows Azure &mdash; and as a platform on which to build OpenStack clouds.</p>
-			<p>There are two Canonical partner programmes that can help you reach this global market of users and developers: the OpenStack Interoperability Lab and the Charm Partner Programme.  Whether you want to improve interoperability in OpenStack, streamline application delivery or simply access more customers, we can help. </p>
+			<p>There are two Canonical partner programmes that can help you reach this global market of users and developers: the OpenStack Interoperability Lab and the Charm Partner Programme. Whether you want to improve interoperability in OpenStack, streamline application delivery or simply access more customers, we can help.</p>
 		</div>
 		<div class="four-col last-col align-center align-vertically">
-			<img class="priority-0" width="250" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/cloud/image-ecosystem.svg" alt="clouds">
+			<img class="priority-0" width="250" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/cloud/image-ecosystem.svg" alt="" />
 		</div>
 	</div>
-</section>
 
-<section class="row vertical-divider">
-	<div class="six-col" id="charm-partner-programme">
-		<div class="twelve-col align-center">
-			<img class="priority-0" width="180" height="180" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-juju.svg" alt="">
-		</div>
-		<h3>Charm Partner Programme</h3>
-		<p>Canonical&rsquo;s award&mdash;winning cloud orchestrator, Juju, uses charms to demo software, integrate it and scale it up and down at the click of button. With Juju charms, any customer can deploy, integrate and scale your products the same way your engineers would.</p>
-		<p><a href="/contact-us">Contact us about the Charm Partner Programme&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="six-col last-col" id="openstack-interoperability-lab">
-		<div class="twelve-col align-center">
-			<img class="priority-0" width="180" height="180" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-openstack.svg" alt="">
-		</div>
-		<h3>Openstack Interoperability Lab for Software Partners</h3>
-		<p>In launching the Ubuntu OpenStack Interoperability Lab (OIL), Canonical has invested heavily in interoperability testing for OpenStack and Ubuntu. OIL offers significant benefits for partners looking to QA their products quickly and cost-effectively, ensuring they are are compatible with all versions of Ubuntu OpenStack.</p>
-		<p><a href="/programmes/openstack">Learn more about OpenStack Interoperability Lab&nbsp;&rsaquo;</a></p>
-	</div>
+  <div class="twelve-col vertical-divider">
+  	<div class="six-col" id="charm-partner-programme">
+  		<div class="six-col align-center">
+  			<img class="priority-0" width="140" height="140" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-juju.svg" alt="" width />
+  		</div>
+  		<h3>Charm Partner Programme</h3>
+  		<p>Canonical&rsquo;s award&mdash;winning cloud orchestrator, Juju, uses charms to demo software, integrate it and scale it up and down at the click of button. With Juju charms, any customer can deploy, integrate and scale your products the same way your engineers would.</p>
+  		<p><a href="/contact-us">Contact us about the Charm Partner Programme&nbsp;&rsaquo;</a></p>
+  	</div>
+  	<div class="six-col last-col" id="openstack-interoperability-lab">
+  		<div class="six-col align-center">
+  			<img class="priority-0" width="140" height="140" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-openstack.svg" alt="" />
+  		</div>
+  		<h3>Openstack Interoperability Lab for Software Partners</h3>
+  		<p>In launching the Ubuntu OpenStack Interoperability Lab (OIL), Canonical has invested heavily in interoperability testing for OpenStack and Ubuntu. OIL offers significant benefits for partners looking to QA their products quickly and cost-effectively, ensuring they are are compatible with all versions of Ubuntu OpenStack.</p>
+  		<p><a href="/programmes/openstack">Learn more about OpenStack Interoperability Lab&nbsp;&rsaquo;</a></p>
+  	</div>
+  </div>
 </section>
 {% include "templates/_contextual-footer.html" %}
 {% endblock %}
\ No newline at end of file