haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 20:08:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1322 from haiwen/tc-markdown

Browse Source 
[T&C] show the content in markdown
This commit is contained in:
Daniel Pan
2016-08-11 12:05:27 +08:00
committed by GitHub
parent c4ffca620e 992c094d55
commit ece8fc7e5f
3 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/css/seahub.css
View File

@@ -3608,3 +3608,18 @@ img.thumbnail {
padding: 2px 3px;
border-radius: 2px;
}
/* terms & conditions */
#tc-content {
padding-top:0;
padding-left:0;
}
.tc-accept-form {
padding-bottom:30px;
}
#tc-preview {
box-sizing:border-box;
padding:40px;
width:800px;
overflow:auto;
}

25
seahub/templates/sysadmin/sys_terms_admin.html
View File

@@ -26,7 +26,7 @@
<tr>
<td>{{ tc.name }}</td>
<td>{{ tc.version_number }}</td>
<td><a href="#" class="js-text" data-msg="{{ tc.text|linebreaksbr }}">{{ tc.text|truncatechars:50 }}</a></td>
<td><a href="#" class="js-text" data-msg="{{ tc.text }}">{{ tc.text|truncatechars:50 }}</a></td>
<td>{{ tc.date_created|translate_seahub_time }}</td>
<td>
{% if tc.date_active %}
@@ -71,11 +71,12 @@
<button type="submit" class="submit">{% trans "Submit" %}</button>
</form>
<div id="popup-msg" class="hide"></div>
<div id="tc-preview" class="article hide"></div>
{% endblock %}
{% block extra_script %}
<script type="text/javascript" src="{{MEDIA_URL}}js/editormd/lib/marked.min.js"></script>
<script type="text/javascript">
$('#add-btn').click(function() {
$('#tc-form').modal();
@@ -143,11 +144,23 @@ addConfirmTo($('.remove-btn'), {
'post': true // post request
});
var renderer = new marked.Renderer();
// remove 'id' attribute for headings
renderer.heading = function (text, level) {
return '<h' + level + '>' + text + '</h' + level + '>';
};
marked.setOptions({
renderer: renderer,
breaks: true, // keep linebreak
smartLists: true,
sanitize: true // Ignore any HTML that has been input
});
$('.js-text').click(function() {
$('#popup-msg').html($(this).attr('data-msg')).modal({
minWidth: 150
});
$('#simplemodal-container').css({'height':'auto'});
$('#tc-preview')
.html(marked($(this).attr('data-msg')))
.css({'max-height': $(window).height() - 120}) // 120: the vertical paddings of #tc-preview & the popup
.modal();
return false;
});

26
seahub/templates/termsandconditions/tc_accept_terms.html
View File

@@ -3,14 +3,30 @@
{% block wide_page_content %}
<h1>{{ form.initial.terms.name|safe }}</h1>
{{ form.errors }}
<div id="tc-terms-html">
{{ form.initial.terms.text|safe|linebreaksbr }}
</div>
<form action="{% url 'tc_accept_page' %}" method="post">{% csrf_token %}
<div id="tc-content" class="article"></div>
<form action="{% url 'tc_accept_page' %}" method="post" class="tc-accept-form">{% csrf_token %}
{{ form.terms }}
{{ form.returnTo }}
<button type="submit" class="submit">{% trans "Accept" %}</button>
<a href="{% url 'auth_logout' %}" class="sf-btn-link">{% trans "Cancel" %}</a>
</form>
{% endblock %}
{% block extra_script %}
<script type="text/javascript" src="{{MEDIA_URL}}js/editormd/lib/marked.min.js"></script>
<script type="text/javascript">
var renderer = new marked.Renderer();
// remove 'id' attribute for headings
renderer.heading = function (text, level) {
return '<h' + level + '>' + text + '</h' + level + '>';
};
marked.setOptions({
renderer: renderer,
breaks: true, // keep linebreak
smartLists: true,
sanitize: true // Ignore any HTML that has been input
});
$('#tc-content').html(marked("{{ form.initial.terms.text|escapejs }}"));
</script>
{% endblock %}