Manual merge of the new document preview code from the unstable branch

This commit is contained in:
Roberto Rosario
2014-07-02 02:53:53 -04:00
parent 77ff0f7191
commit 0cda1148bb
139 changed files with 6330 additions and 2349 deletions

View File

@@ -1,7 +1,10 @@
{% load i18n %}
{% load theme_tags %}
{% load static %}
{% load compress %}
{% load theme_tags %}
{% get_theme as web_theme %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -11,10 +14,10 @@
<meta http-equiv="Content-Language" content="{{ LANGUAGE_CODE }}" />
<title>{% block html_title %}{% endblock %}</title>
{% block web_theme_head %}{% endblock %}
{% block web_theme_head %}{% endblock %}
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}web_theme_media/stylesheets/base.css" type="text/css" media="screen" />
{% compress css %}
<link rel="stylesheet" href="{% static 'web_theme_media/stylesheets/base.css' %}" type="text/css" media="screen" />
<link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme|default:'activo' }}/style.css" type="text/css" media="screen" />
<style type="text/css">
.message span.dismiss {
@@ -34,16 +37,16 @@
font-weight:bold
}
</style>
<link rel="stylesheet" href="{{ STATIC_URL }}packages/animate-custom.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{% static 'packages/animate-custom.css' %}" type="text/css" media="screen" />
{% block web_theme_stylesheets %}{% endblock %}
{% endcompress %}
{% endcompress %}
{% compress js %}
<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery-1.7.min.js"></script>
{% compress js %}
<script type="text/javascript" charset="utf-8" src="{% static 'packages/jquery-2.1.1.min.js' %}"></script>
{% if enable_scroll_js %}
<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.scrollTo.js"></script>#}
<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.localscroll.js"></script>#}
<script type="text/javascript" charset="utf-8" src="{% static 'web_theme_media/javascripts/jquery.scrollTo.js' %}"></script>
<script type="text/javascript" charset="utf-8" src="{% static 'web_theme_media/javascripts/jquery.localscroll.js' %}"></script>
{% endif %}
{% block web_theme_javascript %}{% endblock %}
@@ -56,18 +59,18 @@
$(".dismiss-all").click(function(){
$(".message").each(function(){
$(this).addClass("fadeOutUp").fadeOut("slow");
});
});
return false;
});
$('th input:checkbox').click(function(e) {
var table = $(e.target).closest('table');
$('td input:checkbox', table).attr('checked', e.target.checked);
});
});
});
</script>
{% endcompress %}
</head>
<body>
</head>
<body>
<div id="container">
{% if web_theme_view_type == 'plain' %}
<div id="box">
@@ -112,12 +115,12 @@
{% block web_theme_secondary_navigation %}{% endblock %}
{#{% endif %}#}
{% block web_theme_content %}{% endblock %}
</div><!--end .block #block-text-->
</div><!--end .block #block-text-->
{% block web_theme_footer %}{% endblock %}
</div><!--end #main-->
<div id="sidebar">
{% block web_theme_sidebar %}{% endblock %}
</div><!--end #sidebar-->
</div><!--end #sidebar-->
</div><!--end #wrapper .wat-cf-->
{% endif %}
</div><!--end #container-->