Back to ads.

master
Nick Sergeant 2013-10-15 10:23:37 -04:00
parent d2d7c5e09c
commit 85b968113e
9 changed files with 49 additions and 116 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -495,41 +495,21 @@ section.main {
}
}
section.ad {
background: white;
border: 1px solid #E8E8E8;
border-bottom: 0;
height: 231px;
margin: 0 0 0 15px;
padding-top: 20px;
width: auto;
@include multi-border-radius(5px, 5px, 0, 0);
div.carbonad {
border-width: 1px;
border-bottom: 0;
height: 231px;
width: auto;
@include multi-border-radius(5px, 5px, 0, 0);
a#bsap_aplink {
color: #999999;
margin-left: 21px;
div#azcarbon {
span.carbonad-image {
a {
img {
margin-left: 21px;
margin-top: 21px;
}
}
}
span.carbonad-text {
color: #999999;
margin-left: 21px;
a {
color: #999999;
}
}
span.carbonad-tag {
margin-left: 0;
text-align: center;
width: 100%;
a {
margin-left: 3px;
}
}
a {
color: #999999;
}
}
}
@ -1442,7 +1422,7 @@ div.modal {
div#disqus_thread {
margin-bottom: 0;
margin-left: 15px;
width: 825px;
width: 719px;
#dsq-content {
margin-top: -44px;
@ -1669,21 +1649,11 @@ body.blog {
}
}
body.detail {
div.right-y {
display: none;
}
section.main {
div.inner {
width: 100%;
section.snipts {
article.snipt {
margin-bottom: 0;
margin-top: 15px;
div.container {
width: 839px;
header {
h1 {
a {
@ -1693,14 +1663,6 @@ body.detail {
}
section.code {
height: auto;
td.code {
div.highlight {
pre {
width: 810px;
}
}
}
}
&.full-screened {
&:after {
@ -1708,37 +1670,10 @@ body.detail {
}
}
}
aside {
margin-right: 0;
}
footer {
ul.attrs {
li.raw {
margin-right: 100px;
}
}
}
}
}
}
}
div.rochester-made {
width: 840px;
}
div.site-notice, a.go-pro {
margin-right: 100px;
}
div.showroom-container {
background: transparent url('http://showroom.is/static/img/background.jpg') top left repeat;
border: 1px solid #DDDDDD;
border-left: 0;
margin: 30px 0;
a.go-pro {
border: 0;
margin: 0 auto;
}
}
}
body.error {
section.main {
@ -2726,3 +2661,12 @@ body.jobs {
}
}
}
body .one .bsa_it_ad { background: transparent; border: none; font-family: inherit; padding: 0 15px 0 10px; margin: 0; text-align: center; }
body .one .bsa_it_ad:hover img { -moz-box-shadow: 0 0 3px #000; -webkit-box-shadow: 0 0 3px #000; box-shadow: 0 0 3px #000; }
body .one .bsa_it_ad .bsa_it_i { display: block; padding: 0; float: none; margin: 0 0 5px; }
body .one .bsa_it_ad .bsa_it_i img { padding: 0; border: none; }
body .one .bsa_it_ad .bsa_it_t { padding: 6px 0; }
body .one .bsa_it_ad .bsa_it_d { padding: 0; font-size: 12px; color: #333; }
body .one .bsa_it_p { display: none; }
body #bsap_aplink, body #bsap_aplink:hover { display: block; font-size: 10px; margin: 12px 15px 0; text-align: center; }

View File

@ -14,11 +14,6 @@
<li><span class="prompt">/</span> <a href="{{ snipt.get_absolute_url }}">{{ snipt.title }}</a></li>
{% endblock %}
{% block aside %}
{% if request.path == '/api/' or request.path == '/blogging/' %}
{{ block.super }}
{% endif %}
{% endblock %}
{% block aside-inner %}
{% if request.path == '/api/' %}
{% if request.user.is_authenticated %}
@ -43,11 +38,6 @@
{% endblock %}
{% block content %}
{% if not request.user.profile.is_pro %}
<div class="showroom-container">
<a class="go-pro" href="http://showroom.is/"></a>
</div>
{% endif %}
<section class="snipts" id="snipts">
{% with 'true' as detail %}
{% include "snipts/snipt-list.html" %}

View File

@ -13,9 +13,6 @@
{% block content %}
<section class="snipts" id="snipts" ng-controller="SniptListController">
{% if not request.user.profile.is_pro %}
{% include 'go-pro.html' %}
{% endif %}
{% autopaginate snipts 10 %}
{% for snipt in snipts %}
{% include "snipts/snipt-list.html" %}

View File

@ -37,8 +37,8 @@ def detail(request, username, snipt_slug):
if request.GET.get('key') != snipt.key:
raise Http404
snipt.views = snipt.views + 1
snipt.save()
#snipt.views = snipt.views + 1
#snipt.save()
tags = Tag.objects

9
templates/ad.html Normal file
View File

@ -0,0 +1,9 @@
<section class="ad">
<!-- AdPacks.com Zone Code -->
<div id="bsap_1268466" class="bsarocks bsap_b70f66b78b7f9318d905def548557dc9"></div>
<a href="http://adpacks.com" id="bsap_aplink">via Ad Packs</a>
<!-- End AdPacks.com Zone Code -->
</section>
<div class="go-pro">
<a href="/pro/" class="btn btn-success">Hate ads? Go Pro &raquo;</a>
</div>

View File

@ -71,6 +71,17 @@
</head>
<body class="{% block body-class %}{% endblock %} {% if request.user.profile.is_pro %}is-pro{% endif %}">
<!-- AdPacks.com Ad Code -->
<script type="text/javascript">
(function(){
var bsa = document.createElement('script');
bsa.type = 'text/javascript';
bsa.async = true;
bsa.src = '//s3.buysellads.com/ac/bsa.js';
(document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(bsa);
})();
</script>
<!-- End AdPacks.com Ad Code -->
{% block header %}
<header class="main">
<div class="inner">
@ -197,9 +208,9 @@
<section class="main group" id="main">
{% block aside %}
<aside class="main">
<!--<div class="save-nate">-->
<!--<a href="http://www.indiegogo.com/projects/i-am-going-to-survive">Save a dev: Chloe</a>-->
<!--</div>-->
{% if not request.user.profile.is_pro %}
{% include 'ad.html' %}
{% endif %}
{% block aside-top %}{% endblock %}
{% block aside-inner %}{% endblock %}
<nav class="footer">

View File

@ -1,18 +0,0 @@
<section class="ad">
<div id="carbonads-container">
<div class="carbonad">
<div id="azcarbon"></div>
<script type="text/javascript">
var z = document.createElement("script");
z.type = "text/javascript";
z.async = true;
z.src = "https://engine.carbonads.com/z/12124/azcarbon_2_1_0_VERT";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(z, s);
</script>
</div>
</div>
</section>
<div class="go-pro">
<a href="/pro/" class="btn btn-success">Hate ads? Go Pro &raquo;</a>
</div>