haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-22 03:16:34 +00:00
Code Issues Releases Wiki Activity

[misc] fix

Browse Source
This commit is contained in:
llj
2017-11-24 15:49:06 +08:00
parent b26d705ea9
commit 17d2e2f9c7
7 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/css/seahub.css
View File

@@ -3250,6 +3250,7 @@ button.sf-dropdown-toggle:focus {
padding:20px;
}
.help-con img {
max-width:100%;
margin:5px 0;
}
#right-panel.help-con .hd {

4
media/js/base.js
View File

@@ -106,13 +106,13 @@ function addConfirmTo(op_ele, popup) {
op_ele.click(function() {
var con = '';
if ($(this).data('target') && popup['con'].indexOf('%s') != -1) {
con = popup['con'].replace('%s', '<span class="op-target">' + HTMLescape($(this).data('target')) + '</span>');
con = popup['con'].replace('%s', '<span class="op-target ellipsis ellipsis-op-target">' + HTMLescape($(this).data('target')) + '</span>');
} else {
con = popup['con'];
}
$('#confirm-con').html('<h3>' + popup['title'] + '</h3><p>' + con + '</p>');
$('#confirm-popup').modal({appendTo:'#main'});
$('#simplemodal-container').css({'height':'auto'});
$('#simplemodal-container').css({'width': 'auto', 'height':'auto'});
$('#confirm-yes').data('url', $(this).data('url')).click(function() {
if (popup.post) { // use form post
$('<form>', {

2
seahub/help/templates/help/base.html
View File

@@ -38,7 +38,5 @@ $('.side-nav li').each(function() {
}
}
});
$('.help-con img').css('max-width', $('.help-con').width() - 2);
</script>
{% endblock %}

2
seahub/help/templates/help/install.html
View File

@@ -27,7 +27,7 @@
<p>{% trans "You can also create a library from a local folder." %}</p>
<img src="{{ MEDIA_URL }}img/help/seafile-create-library.png" alt="" />
<img src="{{ MEDIA_URL }}img/help/seafile-create-library.png" alt="" /><br />
<img src="{{ MEDIA_URL }}img/help/seafile-create-library-02.png" width="550" alt="" />

31
seahub/notifications/templates/notifications/notification_list.html
View File

@@ -11,15 +11,19 @@
<form action="{% url 'notification_add' %}" method="post" class="hide" id="add-n-form">{% csrf_token %}
<h3>{% trans "Add new notification" %}</h3>
<textarea name="message" class="textarea"></textarea><br />
<p class="error hide"></p>
<input type="submit" value="{% trans "Submit" %}" class="submit" />
</form>
{% if notes %}
<table>
<tr>
<th width="75%">{% trans "Notification Detail" %}</th>
<th width="25%">{% trans "Operations" %}</th>
</tr>
<thead>
<tr>
<th width="75%">{% trans "Notification Detail" %}</th>
<th width="25%">{% trans "Operations" %}</th>
</tr>
</thead>
<tbody>
{% for note in notes %}
<tr>
<td>{{ note.message }}
@@ -28,12 +32,13 @@
{% endif %}
<td>
{% if note.primary != 1 %}
<a href="#" data="{{ SITE_ROOT }}notification/set-primary/{{ note.id }}/" class="note-change-btn op vh">{% trans "Set to current" %}</a>
<a href="#" data-id="{{ note.id }}" class="set-cur-btn op vh">{% trans "Set to current" %}</a>
{% endif %}
<a href="#" data-url="{{ SITE_ROOT }}notification/delete/{{ note.id }}/" data-target="{{ note.message }}" class="note-delete-btn op vh">{% trans "Delete" %}</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>{% trans "Empty" %}</p>
@@ -44,17 +49,25 @@
<script type="text/javascript">
$('#add-n').click(function() {
$('#add-n-form').modal();
$('#simplemodal-container').css({'height':'auto'});
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
return false;
});
$('#add-n-form').submit(function() {
var $form = $(this);
var msg = $.trim($('[name="message"]', $form).val());
if (!msg) {
$('.error', $form).html("{% trans "It is required." %}").show();
return false;
}
});
addConfirmTo($('.note-delete-btn'), {
'title':"{% trans "Delete Notification" %}",
'con':"{% trans "Are you sure you want to delete %s ?" %}"
});
$('.note-change-btn').click(function() {
window.location = $(this).attr('data');
})
$('.set-cur-btn').click(function() {
location.href = '{{ SITE_ROOT }}notification/set-primary/' + $(this).attr('data-id') + '/';
});
</script>
{% endblock %}

4
seahub/profile/templates/profile/set_profile.html
View File

@@ -76,7 +76,7 @@
<br/>
{% endif %}
<input type="submit" value="{% trans "Submit" %}" class="submit" />
<input type="submit" value="{% trans "Submit" %}" class="submit vh" />
</form>
</div>
@@ -221,7 +221,7 @@ $('#user-avatar-input').change(function() {
$('#user-avatar-form').submit();
});
$('#user-basic-info .submit').css({'margin-left': $('#user-basic-info label').outerWidth(true)});
$('#user-basic-info .submit').css({'margin-left': $('#user-basic-info label').outerWidth(true)}).removeClass('vh');
$('#account-delete-btn').click(function () {
var title = "{% trans "Delete Account" %}",

8
seahub/templates/base.html
View File

@@ -34,14 +34,14 @@
<div id="header" class="navbar {% block header_css_class %}navbar-fixed-top{% endblock %}">
<div id="header-inner">
{% block notice_panel %}{% endblock %}
<a href="{{ SITE_ROOT }}" id="logo" class="fleft">
<a href="{{ SITE_ROOT }}" id="logo" class="hidden-sm-down fleft">
{% if seacloud_mode %}
<img src="{{ MEDIA_URL }}img/seacloud_logo.png?t=1398068110" title="Seacloud" alt="logo" width="186" height="31" />
{% else %}
<img src="{{ MEDIA_URL }}{{ logo_path }}" title="{{ site_title }}" alt="logo" width="{{logo_width}}" height="{{logo_height}}" />
{% endif %}
</a>
<button class="sf2-icon-list-view side-nav-toggle hidden-md-up hide" title="{% trans "Side Nav Menu" %}" id="js-toggle-side-nav" aria-label="{% trans "Side Nav Menu" %}"></button>
<button class="sf2-icon-list-view side-nav-toggle hidden-md-up" title="{% trans "Side Nav Menu" %}" id="js-toggle-side-nav" aria-label="{% trans "Side Nav Menu" %}"></button>
{% block header_right %}
{% if request.user.is_authenticated %}
@@ -221,10 +221,6 @@ $('#info-bar .close').click(function() {
})();
{% endif %}
if ($('.side-nav').length) {
$('#logo').addClass('hidden-sm-down');
$('#js-toggle-side-nav').removeClass('hide');
}
$('#js-toggle-side-nav').click(function() {
$('.side-nav').css({'left': 0});
return false;