Site-wide notice about membership change.

master
Nick Sergeant 2014-04-22 09:30:03 -04:00
parent 5deb065aea
commit 6c27c8af2f
6 changed files with 3167 additions and 3164 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

@ -450,6 +450,23 @@ section.main {
position: relative; position: relative;
width: 940px; width: 940px;
.site-notice {
border-left: 1px solid #DDDDDD;
display: block;
margin-bottom: 0;
margin-top: 30px;
position: relative;
text-align: left;
z-index: 999;
@include multi-border-radius(0, 3px, 3px, 0);
span {
text-decoration: underline;
}
&:hover {
text-decoration: none;
}
}
div.ruler { div.ruler {
background: #DDDDDD; background: #DDDDDD;
height: 100%; height: 100%;

View File

@ -1,4 +1,4 @@
<div class="exclusive-ad"> <!-- <div class="exclusive-ad">
<div ng-cloak> <div ng-cloak>
<div ng-repeat="ad in ads" ng-show="randomAd == ad"> <div ng-repeat="ad in ads" ng-show="randomAd == ad">
<h3>{[{ ad.title }]}</h3> <h3>{[{ ad.title }]}</h3>
@ -10,4 +10,4 @@
</a> </a>
</div> </div>
</div> </div>
</div> </div> -->

View File

@ -79,6 +79,7 @@
<!-- end Mixpanel --> <!-- end Mixpanel -->
</head> </head>
<body class="{% block body-class %}{% endblock %} {% if request.user.profile.is_pro %}is-pro{% endif %}" ng-controller="AppController"> <body class="{% block body-class %}{% endblock %} {% if request.user.profile.is_pro %}is-pro{% endif %}" ng-controller="AppController">
{% block header %} {% block header %}
<header class="main"> <header class="main">
<div class="inner"> <div class="inner">
@ -120,9 +121,6 @@
</button> </button>
</li> </li>
{% endif %} {% endif %}
<li>
<a href="/jobs/" {% if '/jobs/' in request.path %} class="active"{% endif %}>Jobs</a>
</li>
</ul> </ul>
</nav> </nav>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
@ -203,6 +201,11 @@
{% endblock %} {% endblock %}
{% block main %} {% block main %}
<section class="main group" id="main"> <section class="main group" id="main">
{% if not request.user.profile.is_pro %}
<a href="https://blog.snipt.net/moving-away-from-free-accounts-and-planning-for-the-future/" class="site-notice alert alert-info">
<strong>Notice:</strong> Snipt is moving away from free accounts on <strong>May 1st, 2014</strong>. <span>Read more about the transition here</span>.
</a>
{% endif %}
{% block aside %} {% block aside %}
<aside class="main"> <aside class="main">
{% block ad %} {% block ad %}
@ -371,7 +374,6 @@
{% block inline-js %} {% block inline-js %}
<script type="text/javascript"> <script type="text/javascript">
{% block js %} {% block js %}
window.user = '{{ request.user.username }}'; window.user = '{{ request.user.username }}';
window.user_id = {% firstof request.user.id 'null' %}; window.user_id = {% firstof request.user.id 'null' %};
window.user_ip = '{{ request.META.REMOTE_ADDR }}'; window.user_ip = '{{ request.META.REMOTE_ADDR }}';
@ -385,7 +387,6 @@
{% endif %} {% endif %}
window.api_key = '{{ request.user.api_key.key }}'; window.api_key = '{{ request.user.api_key.key }}';
{% endblock %} {% endblock %}
{% if request.user.profile.is_pro %} {% if request.user.profile.is_pro %}
window.user_is_pro = true; window.user_is_pro = true;
@ -413,7 +414,6 @@
<script type="text/javascript" src="{{ STATIC_URL }}js/src/account.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/src/account.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/src/snipts.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/src/snipts.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/src/search.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/src/search.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/src/jobs.js"></script>
{% else %} {% else %}
<script type="text/javascript" src="{{ STATIC_URL }}js/snipt-all.min.js?67"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/snipt-all.min.js?67"></script>
{% endif %} {% endif %}
@ -479,17 +479,5 @@
</div> </div>
{% endblock %} {% endblock %}
<!--[if !(lte IE 8)]><!-->
<script type="text/javascript">
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt GPL-v3-or-Later
(function(){
var e = document.createElement('script'); e.type='text/javascript'; e.async = true;
e.src = document.location.protocol + '//d1agz031tafz8n.cloudfront.net/thedaywefightback.js/widget.min.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(e, s);
})();
// @license-end
</script>
<!--<![endif]-->
</body> </body>
</html> </html>

View File

@ -47,8 +47,6 @@ urlpatterns = patterns('',
url(r'^humans.txt$', TemplateView.as_view(template_name='humans.txt')), url(r'^humans.txt$', TemplateView.as_view(template_name='humans.txt')),
url(r'^sitemap.xml$', sitemap), url(r'^sitemap.xml$', sitemap),
url(r'^tags/$', tags), url(r'^tags/$', tags),
url(r'^jobs/$', jobs),
url(r'^jobs-json/$', jobs_json),
url(r'^pro/$', TemplateView.as_view(template_name='pro.html')), url(r'^pro/$', TemplateView.as_view(template_name='pro.html')),
url(r'^pro/signup/$', pro_signup), url(r'^pro/signup/$', pro_signup),