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;
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 {
background: #DDDDDD;
height: 100%;

View File

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

View File

@ -79,7 +79,8 @@
<!-- end Mixpanel -->
</head>
<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">
<div class="inner">
<div class="shadey"></div>
@ -120,9 +121,6 @@
</button>
</li>
{% endif %}
<li>
<a href="/jobs/" {% if '/jobs/' in request.path %} class="active"{% endif %}>Jobs</a>
</li>
</ul>
</nav>
{% if request.user.is_authenticated %}
@ -187,8 +185,8 @@
{% endif %}
</div>
</header>
{% endblock %}
{% block sub-header %}
{% endblock %}
{% block sub-header %}
<header class="sub">
<div class="inner group">
<ul class="bcrumb">
@ -200,9 +198,14 @@
</div>
</div>
</header>
{% endblock %}
{% block main %}
{% endblock %}
{% block 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 %}
<aside class="main">
{% block ad %}
@ -265,11 +268,11 @@
<div class="left-y ruler"></div>
<div class="right-y ruler"></div>
</section>
{% endblock %}
{% block main-edit %}
{% endblock %}
{% block main-edit %}
<section class="main group hidden" id="main-edit"></section>
{% endblock %}
{% block keyboard-shortcuts %}
{% endblock %}
{% block keyboard-shortcuts %}
<div class="modal hide" id="keyboard-shortcuts">
<div class="modal-header">
<a href="#" class="close">×</a>
@ -364,14 +367,13 @@
</table>
</div>
</div>
{% endblock %}
{% endblock %}
{% block extra-scripts %}{% endblock %}
{% block extra-scripts %}{% endblock %}
{% block inline-js %}
{% block inline-js %}
<script type="text/javascript">
{% block js %}
window.user = '{{ request.user.username }}';
window.user_id = {% firstof request.user.id 'null' %};
window.user_ip = '{{ request.META.REMOTE_ADDR }}';
@ -385,7 +387,6 @@
{% endif %}
window.api_key = '{{ request.user.api_key.key }}';
{% endblock %}
{% if request.user.profile.is_pro %}
window.user_is_pro = true;
@ -395,9 +396,9 @@
window.default_editor = '{{ request.user.profile.get_default_editor_display|lower }}';
window.editor_theme = '{{ request.user.profile.editor_theme }}';
</script>
{% endblock %}
{% endblock %}
{% if debug %}
{% if debug %}
<script type="text/javascript" src="{{ STATIC_URL }}js/libs/underscore.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/libs/json2.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/libs/backbone.js"></script>
@ -413,21 +414,20 @@
<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/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>
{% endif %}
{% endif %}
{% if has_snipts and detail %}
{% if has_snipts and detail %}
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
{% endif %}
{% block snipt-templates %}
{% endif %}
{% block snipt-templates %}
<div class="hidden" id="templates">
{% include 'snipts/snipt-js-template.html' %}
{% include 'snipts/snipt-edit-js-template.html' %}
</div>
{% endblock %}
{% if request.user.is_authenticated %}
{% endblock %}
{% if request.user.is_authenticated %}
{% if not debug %}
{% block intercom %}
<script id="IntercomSettingsScriptTag">
@ -466,30 +466,18 @@
</script>
{% endblock %}
{% endif %}
{% endif %}
{% endif %}
{% include 'analytics.html' %}
{% include 'analytics.html' %}
{% block preload %}
{% block preload %}
<div class="hidden">
<img src="{{ STATIC_URL }}img/header-fixed-save.gif" alt="" />
<img src="{{ STATIC_URL }}img/chosen-sprite.png" alt="" />
<img src="{{ STATIC_URL }}img/aside-nav-open-bottom-bg.gif" alt="" />
<img src="{{ STATIC_URL }}img/aside-nav-open-top-bg.gif" alt="" />
</div>
{% 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]-->
{% endblock %}
</body>
</html>

View File

@ -47,8 +47,6 @@ urlpatterns = patterns('',
url(r'^humans.txt$', TemplateView.as_view(template_name='humans.txt')),
url(r'^sitemap.xml$', sitemap),
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/signup/$', pro_signup),