ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1136 from emanuelschuetze/template-fixes

Browse Source 
Template fixes
This commit is contained in:
Oskar Hahn 2013-12-01 05:09:07 -08:00
commit b4e8b90656
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/projector/templates/projector/default_slide.html
View File

@ -2,5 +2,4 @@
<h1> <h1>
{{ 'welcome_title'|get_config }} {{ 'welcome_title'|get_config }}
<hr>
</h1> </h1>

1
openslides/projector/templates/projector/projectorslide_slide.html
View File

@ -2,7 +2,6 @@
<h1> <h1>
{{ slide.title }} {{ slide.title }}
<hr>
</h1> </h1>
{% if slide.text %} {% if slide.text %}

2
openslides/static/javascript/utils.js
View File

@ -72,7 +72,7 @@ $(function () {
function new_message(text, type) { function new_message(text, type) {
var message = $('#dummy-notification').clone(true); var message = $('#dummy-notification').clone(true);
$(message).removeAttr('id').addClass(type).children('em').html(text); $(message).removeAttr('id').addClass(type).html(text);
$('#notifications').append(message); $('#notifications').append(message);
message.slideDown('fast'); message.slideDown('fast');
} }

2
openslides/templates/base.html
View File

@ -87,7 +87,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div id="notifications"> <div id="notifications">
<div id="dummy-notification" class="notification" style="display:none"> <div id="dummy-notification" class="alert" style="display:none">
<button type="button" class="close" data-dismiss="alert">×</button> <button type="button" class="close" data-dismiss="alert">×</button>
</div> </div>
{% for message in messages %} {% for message in messages %}