Commit 913f009f authored by Troy Grandy's avatar Troy Grandy

More minor changes.

parent 45b1d43f
......@@ -187,7 +187,8 @@ class SlideLayerForm(forms.ModelForm):
class SlideshowForm(forms.ModelForm):
class Meta:
model = Slideshow
fields = ['title', 'description', 'overlay']
# Add overlay back later
fields = ['title', 'description']
def __init__(self, *args, **kwargs):
super(SlideshowForm, self).__init__(*args, **kwargs)
......
This diff is collapsed.
This diff is collapsed.
......@@ -16,6 +16,7 @@
{% block style %}
<link rel="stylesheet" href="/static/easyui/easyui.css">
<link rel="stylesheet" href="/static/css/summernote-lite.css">
<style>
body{
padding: 0;
......@@ -345,6 +346,7 @@
{% endblock %}
{% block script %}
<script type="text/javascript" src="/static/easyui/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/static/js/summernote-lite.js"></script>
<script>
$(document).ready(function(){
$('#summernote').appendTo('#summernoteWrapper')
......
......@@ -286,7 +286,7 @@ function iconFlip(icon){
}
}
$('.panel-heading').click(function(){
$('.group-pane .panel-heading').click(function(){
iconFlip($(this));
setTimeout(function(){
btnFlip(),
......@@ -305,7 +305,7 @@ $('#expand-all').click(function(){
$(this).html('Collapse All <i class="fa fa-chevron-up"></i>')
status = 'Collapse'
}
$('.row .panel-heading').each(function(){
$('.group-pane .row .panel-heading').each(function(){
if (!($(this).hasClass('collapsed')) && status == 'Expand'){
$(this).click()
}
......
......@@ -104,7 +104,7 @@ function iconFlip(icon){
}
}
$('.panel-heading').click(function(){
$('.group-pane .panel-heading').click(function(){
iconFlip($(this));
setTimeout(function(){
btnFlip(),
......@@ -123,7 +123,7 @@ $('#expand-all').click(function(){
$(this).html('Collapse All <i class="fa fa-chevron-up"></i>')
status = 'Collapse'
}
$('.row .panel-heading').each(function(){
$('.group-pane .row .panel-heading').each(function(){
if (!($(this).hasClass('collapsed')) && status == 'Expand'){
$(this).click()
}
......
......@@ -164,7 +164,7 @@ function iconFlip(icon){
}
}
$('.panel-heading').click(function(){
$('.group-pane .panel-heading').click(function(){
iconFlip($(this));
setTimeout(function(){
btnFlip(),
......@@ -183,7 +183,7 @@ $('#expand-all').click(function(){
$(this).html('Collapse All <i class="fa fa-chevron-up"></i>')
status = 'Collapse'
}
$('.row .panel-heading').each(function(){
$('.group-pane .row .panel-heading').each(function(){
if (!($(this).hasClass('collapsed')) && status == 'Expand'){
$(this).click()
}
......
......@@ -69,10 +69,10 @@
</div>
<div class="col-lg-6 col-lg-pull-6 col-xs-12">
{% crispy form %}
<p>New! Add a slide as an overlay and it will appear on top of all the slides in a slideshow</p>
{% comment %} <p>New! Add a slide as an overlay and it will appear on top of all the slides in a slideshow</p>
<div id="overlay-info" class="col-sm-8">
<button type="button" class=" btn btn-block btn-primary addslidebutton">Add an overlay</button>
</div>
</div> {% endcomment %}
</div>
</div>
<div class="btn-group" style="margin-bottom: 5px;">
......
......@@ -141,7 +141,7 @@ function iconFlip(icon){
}
}
$('.panel-heading').click(function(){
$('.group-pane .panel-heading').click(function(){
iconFlip($(this));
setTimeout(function(){
btnFlip(),
......@@ -160,7 +160,7 @@ $('#expand-all').click(function(){
$(this).html('Collapse All <i class="fa fa-chevron-up"></i>')
status = 'Collapse'
}
$('.row .panel-heading').each(function(){
$('.group-pane .row .panel-heading').each(function(){
if (!($(this).hasClass('collapsed')) && status == 'Expand'){
$(this).click()
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment