sponsored pages init

Progressbar · Aug 20, 2011 · c1cb89d · c1cb89d
1 parent 3b0265a
commit c1cb89d
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 20 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -22,6 +22,9 @@
               <% end %>
 
               <%= yield %>
+
+              <div class="reset">&nbsp;</div>
+
               <div id="feedback">
                 <a href="https://docs.google.com/spreadsheet/viewform?hl=en_GB&formkey=dHBPbTMwOHBvMzZVLVEzM09wanh0WEE6MQ" id="feedback-btn"><%= t('feedback') %></a>
 

diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
@@ -9,21 +9,17 @@
     <p class="float-left">
       <a class="no-underline" href="<%= RefinerySetting.find_or_set(:site_facebook, 'http://www.facebook.com/progressbar') %>"><img alt="Facebook icon" src="/images/s.gif" class="sprites sprite-icon-facebook-32" /></a>
     </p>
-    <!--
-    <p>
-      <a class="no-underline" href="https://foursquare.com/venue/<%= RefinerySetting.find_or_set(:site_foursquare_id, '7713190') %>"><img alt="Facebook icon" src="/images/s.gif" class="sprites sprite-icon-facebook-32" /> FourSquare</a>
-    </p>
-    -->
-    <div class="reset">&nbsp;</div>
-    <p>
-      <%= t('follow_us.find_bug') %>
+    <p class="float-left">
+      <a class="no-underline" href="https://foursquare.com/venue/<%= RefinerySetting.find_or_set(:site_foursquare_id, '7713190') %>"><img alt="Facebook icon" src="/images/s.gif" class="sprites sprite-icon-facebook-32" /></a>
     </p>
-    <p>
+
+    <p class="float-left">
       <a class="no-underline" href="<%= RefinerySetting.find_or_set(:site_github, 'https://github.com/Progressbar') %>" >
         <img alt="Github icon" src="/images/s.gif" class="sprites sprite-icon-github-32" title="<%= t('follow_us.visit_github') %>" />
-        <span class="action-button"><%= t('follow_us.send_patch') %></span>
       </a>
     </p>
+    <div class="reset">&nbsp;</div>
+    <!--
     <p>
       <%= t('follow_us.send_email') %>
     </p>
@@ -32,6 +28,7 @@
         <span class="action-button"><%= RefinerySetting.find_or_set(:site_webmaster_email, 'webmaster@progressbar.sk') %></span>
       </a>
     </p>
+    -->
   </div>
 </section>
 <section id="mailing-list">
@@ -42,6 +39,21 @@
     <%= render :partial => "/mailing_lists/form" %>
   </div>
 </section>
+<section id="order">
+  <header>
+    <h3><%= t('Mohlo by vás zaujímať') %></h3>
+  </header>
+  <div class="content">
+    <p>
+      <a class="button" href="/sponsored/web-aplikacie" >Web aplikácie</a> &nbsp;
+      <a class="button" href="/sponsored/penetracne-testy" >Penetračné testy</a> &nbsp;
+      <a class="button" href="#" class="todo">Web hosting</a> &nbsp;
+      <a class="button" href="#" class="todo">Outsourcing</a>
+    </p>
+    <p class="msg info note"><img class="ui-icon ui-icon-info" src="/images/s.gif" alt="info icon">Objednaním niektorej zo služieb priamo podporíte prevádzku hackerspacu.</p>
+
+  </div>
+</section>
 <section id="address" >
   <header>
     <h3 class="hidden"><%= t('address.title') %></h3>

diff --git a/app/views/templates/projects.html.erb b/app/views/templates/projects.html.erb
@@ -1,4 +1,5 @@
 <section id="projects">
+  <h3>Aktívne sa venujeme a podielame napriklad na projektoch:</h3>
   <div class="project-wrapper">
     <article class="project">
       <header>

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
@@ -104,10 +104,10 @@ sk:
       desc: 'Prezentácie o webovej bezpečnosti, pracovné stretnutia a predstavovanie OWASP projektov.'
     arduino:
       title: 'Arduino hacking'
-      desc: 'Arduino je open-source elektronika prototypovania platforma založená na flexibilné, ľahko použiteľný software a hardware.'
+      desc: 'Arduino je open-source elektronika prototypovania platforma založená na ľahko použiteľnom software a hardware.'
     bitcoin:
       title: 'Bitcoin - virtuálna mena'
-      desc: 'Vaše Bitcoin peniaze sú dostupné kdekoľvek na svete kde máte k dispozícií internetové pripojenie, na mieste nezáleží. '
+      desc: 'Bitcoin peniaze sú dostupné kdekoľvek na svete kde máte k dispozícií internetové pripojenie.'
     makak:
       title: 'Mačiatka a makaky'
       desc: 'Neviem čo sem dať, ale keď budem vedieť bude to úplne strašne super, že úžasne najsam.'
diff --git a/db/seeds/pages_sponsored.rb b/db/seeds/pages_sponsored.rb
@@ -0,0 +1,32 @@
+::I18n.locale = :sk
+
+p_sponsored = Page.find_by_title('Sponsored')
+
+p_webdevelopment = Page.find_by_title('Web aplikácie')
+p_pentests = Page.find_by_title('Penetračné testy')
+p_outsourcing = Page.find_by_title('Outsourcing správy')
+p_webhosting = Page.find_by_title('Web hosting')
+
+unless p_sponsored
+  p_sponsored = Page.create(:title => 'Sponsored', :deletable => false, :show_in_menu => false, :position => Page.last.position.to_i + 1)
+end
+
+unless p_webdevelopment
+  p_webdevelopment = p_sponsored.children.create(:title => 'Web aplikácie', :deletable => false, :show_in_menu => false, :position => Page.last.position.to_i + 1)
+  p_webdevelopment.parts.create({
+      :title => 'Body',
+      :body => IO.read(Rails.root.join('db/templates/sponsored/web-development.html')),
+      :position => 0
+    })
+
+  p_webdevelopment.parts.create({
+      :title => 'Side Body',
+      :body => '',
+      :position => 1
+    })
+
+else
+  p_webdevelopment.parts.first.update_attributes(:body => IO.read(Rails.root.join('db/templates/sponsored/web-development.html')))
+end
+
+puts 'sponsored pages updated'
diff --git a/db/templates/sponsored/web-development.html b/db/templates/sponsored/web-development.html
@@ -0,0 +1,27 @@
+<h1>HTML Ipsum Presents</h1>
+
+<p><strong>Pellentesque habitant morbi tristique</strong> senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. <a href="#">Donec non enim</a> in turpis pulvinar facilisis. Ut felis.</p>
+
+<h2>Header Level 2</h2>
+
+<ol>
+   <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li>
+   <li>Aliquam tincidunt mauris eu risus.</li>
+</ol>
+
+<blockquote><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.</p></blockquote>
+
+<h3>Header Level 3</h3>
+
+<ul>
+   <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li>
+   <li>Aliquam tincidunt mauris eu risus.</li>
+</ul>
+
+<pre><code>
+#header h1 a { 
+	display: block; 
+	width: 300px; 
+	height: 80px; 
+}
+</code></pre>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -340,17 +340,17 @@ $(function() {
 
 	$("#share-btn").bind('click', function () {
 		$.fancybox(
-			'<div id="share">' +
+			'<div id="share"><p>' +
 			'<span class="share-btn"><g:plusone size="tall"></g:plusone></span>' +
 			'<span class="share-btn"><a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-via="progressbarsk">Tweet</a></span>' +
 			'<span class="share-btn"><script type="IN/Share" data-counter="top"></script></span>' +
 			'<span class="share-btn"><fb:like href="" send="false" layout="box_count" width="100" show_faces="false" action="like" font="arial"></fb:like></span>' +
-			'</div>' +
-			'<p>Ďakujeme, že o nás dávate vedieť. <br />Thank you gave to know about us.</p>',
+			'</p><p>Ďakujeme, že o nás dávate vedieť. <br />Thank you gave to know about us.</p>' +
+			'</div>',
 			{
 				'autoDimensions' : false,
 				'width'          : 350,
-				'height'         : 160
+				'height'         : 170
 			}			
 			);
 
@@ -394,5 +394,22 @@ $(function() {
 				);		
 		});
 
+	$('#order a').fancybox();
+
+//	$('#order a').bind('click',
+//		function () {
+//			$.fancybox(
+//				'<h2>TODO</h2><p>Obsah tejto stránky čaká na teba. ;-)<br />' +
+//				'<a href="https://github.com/Progressbar/web">Prejsť na Github</a><br />' +
+//				'<span class="note">Content for this section is not currently available.</span>' +
+//				'</p>',
+//				{
+//					'autoDimensions' : false,
+//					'width'          : 350,
+//					'height'         : 'auto'
+//				}
+//			);	
+//			return false;	
+//		});
 
 });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -412,6 +412,10 @@ menu li .selected:hover {
 	margin-bottom: 8px;
 }
 
+.project {
+	margin-bottom: 0px;
+}
+
 #calendar {
 	background: url(http://upload.wikimedia.org/wikipedia/commons/c/c0/Gnome-emblem-web.svg) no-repeat top right;
 	background-size: 42px 42px;
@@ -469,7 +473,7 @@ menu li .selected:hover {
 
 #follow-us a {
 	display: inline-block;
-	min-width: 160px;
+	margin-right: 16px;
 }
 
 #follow-us a .action-button {
@@ -484,11 +488,14 @@ menu li .selected:hover {
 
 #mailing-list {
 	float: right;	
-
 	background: url(http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/Gnome-mail-mark-unread.svg/120px-Gnome-mail-mark-unread.svg.png) no-repeat top right;
 
 }
 
+#order {
+	clear: left;
+}
+
 #bottom-menu {
 	float: right;
 	padding-top: 20px;
@@ -887,6 +894,11 @@ section#address {
 
 #fancybox-content {
 	color: #333;
+	text-align: left;
+}
+
+#feedback {
+	padding-top: 16px;
 }
 
 #feedback a {

diff --git a/public/stylesheets/narrow.css b/public/stylesheets/narrow.css
@@ -123,12 +123,12 @@
 }
 
 #promo .promo-text {
-    font-size: 22px;
+    font-size: 15px;
     position: static;
 	padding: 16px;
 	width: 100%;
 }
 
 #promo .promo-item-4 .promo-text {
-	font-size: 18px;
+	font-size: 13px;
 }