Rename and clean up static direcories.

- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files

README.rst

@@ -290,6 +290,10 @@ OpenSlides uses the following projects or parts of them:
 
 * `jQuery <http://www.jquery.com>`_, License: MIT
 
+* `jQuery UI <http://jqueryui.com>`_ with custom ui components: core,
+  widget, mouse, sortable, datepicker, slider and css theme 'smoothness',
+  License: MIT
+
 * jQuery Plugins:
 
   - `jQuery DataTables Plugin <http://www.datatables.net>`_, License:
@@ -308,12 +312,6 @@ OpenSlides uses the following projects or parts of them:
   - `jQuery bsmSelect <https://github.com/vicb/bsmSelect/>`_, License:
     MIT/GPLv2
 
-* `jQuery UI <http://jqueryui.com>`_ with custom ui components: core,
-  widget, mouse, sortable, datepicker, slider and css theme 'smoothness',
-  License: MIT
-
-* jQuery UI AddOns:
-
   - `jQuery UI Nested Sortable
     <https://github.com/mjsarfatti/nestedSortable/>`_, License: MIT
 
@@ -321,10 +319,11 @@ OpenSlides uses the following projects or parts of them:
     <http://trentrichardson.com/examples/jQuery-SliderAccess/>`_, License:
     MIT/GPLv2
 
-  - `jQuery timepicker addon
+  - `jQuery UI Timepicker
     <http://trentrichardson.com/examples/timepicker/>`_, License: MIT/GPLv2
 
 
+
 VII. License and authors
 ========================
 

openslides/agenda/signals.py

@@ -60,11 +60,11 @@ def setup_agenda_config(sender, **kwargs):
             help_text=ugettext_lazy('[Begin speach] starts the countdown, [End speach] stops the countdown.'),
             required=False))
 
-    extra_stylefiles = ['styles/timepicker.css', 'styles/jquery-ui/jquery-ui.custom.min.css']
-    extra_javascript = ['javascript/jquery-ui.custom.min.js',
-                        'javascript/jquery-ui-timepicker-addon.min.js',
-                        'javascript/jquery-ui-sliderAccess.min.js',
-                        'javascript/agenda-config-datepicker.js']
+    extra_stylefiles = ['css/jquery-ui-timepicker.css', 'css/jquery-ui/jquery-ui.custom.min.css']
+    extra_javascript = ['js/jquery/jquery-ui.custom.min.js',
+                        'js/jquery/jquery-ui-timepicker-addon.min.js',
+                        'js/jquery/jquery-ui-sliderAccess.min.js',
+                        'js/jquery/datepicker-config.js']
 
     return ConfigCollection(title=ugettext_noop('Agenda'),
                             url='agenda',
@@ -109,7 +109,6 @@ def agenda_list_of_speakers(sender, **kwargs):
                     object_id=slide.pk)[0]
             except IndexError:
                 item = None
-
         if item and get_active_slide().get('type', None) != 'list_of_speakers':
             list_of_speakers = item.get_list_of_speakers(
                 old_speakers_count=config['agenda_show_last_speakers'],

openslides/agenda/static/css/agenda.css

@@ -1,24 +1,57 @@
+/*
+ * Styles for web interface of agenda app
+ *
+ */
+
+/* Agenda overview page */
+tr.topline td {
+    border-bottom: 1px solid #333333;
+    background-color: #CDCDCD;
+}
+table#agendatime {
+    width: auto;
+    margin-bottom: 1em;
+    font-size: 12px;
+}
+table#agendatime td {
+    padding: 3px;
+    white-space: nowrap;
+}
+
+
+/*** List of speakers ***/
+/* List of speakers – agenda item view */
+div#complete_list_of_speakers li {
+    list-style-type: none;
+}
+div#complete_list_of_speakers  li {
+    line-height: 30px;
+}
+#coming_speakers span.ui-icon {
+    position: absolute;
+    margin-left: -15px;
+    margin-top: 6px;
+}
+
+
+/*** Style for agenda sorting ***/
 ol {
     margin: 0;
     padding: 0;
     padding-left: 30px;
 }
-
 ol.agenda_list, ol.agenda_list ol {
     margin: 0 0 0 25px;
     padding: 0;
     list-style-type: none;
 }
-
 ol.agenda_list {
     margin: 0;
 }
-
 .agenda_list li {
     margin: 5px 0 0 0;
     padding: 0;
 }
-
 .agenda_list li > div {
     border: 1px solid #d4d4d4;
     -webkit-border-radius: 3px;
@@ -48,11 +81,9 @@ ol.agenda_list {
     width: 10px;
     display: none;
 }
-        
 .placeholder {
     outline: 1px dashed #4183C4;
 }
-        
 .agenda_list .openclose { width: 40px; float: left; min-height: 1px; }
 .agenda_list .duration { width: 92px; float: right; min-height: 1px; text-align: right; }
 .agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 15px; }
@@ -70,7 +101,6 @@ ol.agenda_list {
     #menu-overview .optional { width: 150px; }
     .agenda_list .optional { float: right; width: 158px; padding-left: 8px;}
 }
-
 @media screen and (max-width: 800px) {
     #menu-overview .optional { width: 100px; }
     .agenda_list .optional { float: right; width: 108px; padding-left: 8px;}

openslides/agenda/static/css/agenda_projector.css

@@ -0,0 +1,61 @@
+/*
+ * Styles for projector slides of agenda app
+ *
+ */
+
+/*** List of speakers – projector slide ***/
+ul#list_of_speakers {
+    list-style-type: none;
+    padding: 0;}
+#list_of_speakers li {
+    font-size: 130%;
+    line-height: 150%;}
+#list_of_speakers .old_speaker {
+    color: #9FA9B7;}
+#list_of_speakers .actual_speaker {
+    font-weight: bold;
+    margin-bottom: 0.5em;}
+
+
+/*** List of speakers – overlay ***/
+#overlay_list_of_speaker_box {
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    border-radius: 0.4em;
+    border: 0.1em solid #777777;
+    background-color: #cccccc;
+    opacity: 0.9;
+    padding: 1em;
+    margin: 1em;
+    z-index: 2;
+    width: 45%;
+    min-width: 200px;}
+#overlay_list_of_speaker_box h3 {
+    margin: 5px;}
+#overlay_list_of_speaker_box ul {
+    list-style-type: none;
+    margin: 5px;}
+#overlay_list_of_speaker_box li {
+    font-size: 120%;
+    line-height: 120%;}
+#overlay_list_of_speaker_box .old_speaker {
+    color: #777777;}
+#overlay_list_of_speaker_box .actual_speaker {
+    font-weight: bold;
+    margin-bottom: 0em;}
+
+
+/*** Agenda Items ***/
+.itemlist {
+    margin-top: 20px;
+}
+.itemlist li {
+    font-size:130%;
+    padding-bottom: 20px;
+    list-style-type: none;
+}
+.itemlist .closed {
+    color: #9FA9B7;
+    list-style-type: none;
+}

openslides/agenda/static/javascript/agenda_sort.js

@@ -1,66 +0,0 @@
-
-$(function() {
-    var $agenda_list = $('ol.agenda_list');
-    
-    var rebuildOpenersClosers = function ( ) {
-        $agenda_list.find("li").each(function() {
-            var $li = $(this);
-            if ($li.find("> ol").length > 0) $li.find("> div .opener_closer").show();
-            else $li.find("> div .opener_closer").hide();
-        });
-    }
-    
-    var rebuildNesting = function( $root, level, parent_id ) {
-        var $children = $root.find('> li'),
-            curr_weight = -50;
-        
-        $children.each(function() {
-            var $child = $(this),
-                $curr_element = $child.find('> div'),
-                my_id = $curr_element.find('.menu-mlid').val();
-            
-            $curr_element.find('.menu-plid').val(parent_id);
-            $curr_element.find('.menu-weight').val(curr_weight);
-            curr_weight++;
-            
-            $child.find('> ol').each(function() {
-                rebuildNesting( $(this), level + 1, my_id );
-            });
-            
-        });
-        
-    };
-    
-    if ($agenda_list.hasClass("sortable")) $agenda_list.nestedSortable({
-        forcePlaceholderSize: true,
-        handle: 'div',
-        helper:    'clone',
-        items: 'li',
-        opacity: .6,
-        placeholder: 'placeholder',
-        revert: 250,
-        tabSize: 25,
-        tolerance: 'pointer',
-        toleranceElement: '> div',
-        isTree: true,
-        expandOnHover: 700,
-        startCollapsed: true,
-        update: function (event, ui) {
-            var $this = $(this);
-            rebuildNesting($this, 0, 0);
-            $('#changed-order-message').show();
-            rebuildOpenersClosers();
-        }
-    });
-    
-    rebuildOpenersClosers();
-    
-    $agenda_list.find(".opener_closer .opener").click(function(ev) {
-        ev.preventDefault();
-        $(this).parents("li").first().removeClass("closed");
-    });
-    $agenda_list.find(".opener_closer .closer").click(function(ev) {
-        ev.preventDefault();
-        $(this).parents("li").first().addClass("closed");
-    });
-});

openslides/agenda/static/js/agenda.js

@@ -1,3 +1,8 @@
+/*
+ * JavaScript functions for agenda.
+ *
+ */
+
 function hideClosedSlides(hide) {
     if (hide) {
         $('#hidelink').attr('title', 'show');
@@ -74,4 +79,64 @@ $(function() {
         }});
         $('#coming_speakers').disableSelection();
     }
+
+
+    /*
+     * function for sorting agenda items
+     *
+     */
+    var $agenda_list = $('ol.agenda_list');
+    var rebuildOpenersClosers = function ( ) {
+        $agenda_list.find("li").each(function() {
+            var $li = $(this);
+            if ($li.find("> ol").length > 0) $li.find("> div .opener_closer").show();
+            else $li.find("> div .opener_closer").hide();
+        });
+    }
+    var rebuildNesting = function( $root, level, parent_id ) {
+        var $children = $root.find('> li'),
+            curr_weight = -50;
+        
+        $children.each(function() {
+            var $child = $(this),
+                $curr_element = $child.find('> div'),
+                my_id = $curr_element.find('.menu-mlid').val();
+            $curr_element.find('.menu-plid').val(parent_id);
+            $curr_element.find('.menu-weight').val(curr_weight);
+            curr_weight++;
+            $child.find('> ol').each(function() {
+                rebuildNesting( $(this), level + 1, my_id );
+            });
+        });
+    };
+    if ($agenda_list.hasClass("sortable")) $agenda_list.nestedSortable({
+        forcePlaceholderSize: true,
+        handle: 'div',
+        helper: 'clone',
+        items: 'li',
+        opacity: .6,
+        placeholder: 'placeholder',
+        revert: 250,
+        tabSize: 25,
+        tolerance: 'pointer',
+        toleranceElement: '> div',
+        isTree: true,
+        expandOnHover: 700,
+        startCollapsed: true,
+        update: function (event, ui) {
+            var $this = $(this);
+            rebuildNesting($this, 0, 0);
+            $('#changed-order-message').show();
+            rebuildOpenersClosers();
+        }
+    });
+    rebuildOpenersClosers();
+    $agenda_list.find(".opener_closer .opener").click(function(ev) {
+        ev.preventDefault();
+        $(this).parents("li").first().removeClass("closed");
+    });
+    $agenda_list.find(".opener_closer .closer").click(function(ev) {
+        ev.preventDefault();
+        $(this).parents("li").first().addClass("closed");
+    });
 });

openslides/agenda/static/styles/agenda.css

@@ -1,29 +0,0 @@
-tr.topline td {
-    border-bottom: 1px solid #333333;
-    background-color: #CDCDCD;
-}
-
-table#agendatime {
-    width: auto;
-    margin-bottom: 1em;
-    font-size: 12px;
-}
-
-table#agendatime td {
-    padding: 3px;
-    white-space: nowrap;
-}
-
-/*** List of speakers ***/
-/* List of speakers – agenda item view */
-div#complete_list_of_speakers li {
-    list-style-type: none;
-}
-div#complete_list_of_speakers  li {
-    line-height: 30px;
-}
-#coming_speakers span.ui-icon {
-    position: absolute;
-    margin-left: -15px;
-    margin-top: 6px;
-}

openslides/agenda/templates/agenda/edit.html

@@ -15,13 +15,13 @@
 
 {% block header %}
     {{ block.super }}
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/ckeditor.css' %}" />
+    <link type="text/css" rel="stylesheet" media="all" href="{% static 'css/ckeditor.css' %}" />
 {% endblock %}
 
 {% block javascript %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static 'javascript/ckeditor/ckeditor.js' %}"></script>
-    <script type="text/javascript" src="{% static 'javascript/ckeditor-config.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/ckeditor/ckeditor.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/ckeditor-config.js' %}"></script>
     <script>
         // Init CKeditor
         $(function() {

openslides/agenda/templates/agenda/item_slide.html

@@ -1,4 +1,7 @@
 {% load i18n %}
+{% load staticfiles %}
+
+<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda_projector.css' %}" />
 
 <h1>
     {{ item }}

openslides/agenda/templates/agenda/item_slide_list_of_speaker.html

@@ -1,19 +1,7 @@
 {% load i18n %}
+{% load staticfiles %}
 
-<style type="text/css">
-    /* List of speakers – projector slide */
-    ul#list_of_speakers {
-        list-style-type: none;
-        padding: 0;}
-    #list_of_speakers li {
-        font-size: 130%;
-        line-height: 150%;}
-    #list_of_speakers .old_speaker {
-        color: #9FA9B7;}
-    #list_of_speakers .actual_speaker {
-        font-weight: bold;
-        margin-bottom: 0.5em;}
-</style>
+<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda_projector.css' %}" />
 
 <h1>
     {{ title }}

openslides/agenda/templates/agenda/item_slide_summary.html

@@ -1,4 +1,7 @@
 {% load i18n %}
+{% load staticfiles %}
+
+<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda_projector.css' %}" />
 
 <h1>
     {% if title %}{{ title }}{% else %}{% trans "Agenda" %}{% endif %}

openslides/agenda/templates/agenda/overlay_speaker_projector.html

@@ -1,35 +1,5 @@
 {% load i18n %}
 
-<style type="text/css">
-    /* List of speakers – overlay */
-    #overlay_list_of_speaker_box {
-        position: fixed;
-        bottom: 0;
-        right: 0;
-        border-radius: 0.4em;
-        border: 0.1em solid #777777;
-        background-color: #cccccc;
-        opacity: 0.9;
-        padding: 1em;
-        margin: 1em;
-        z-index: 2;
-        width: 45%;
-        min-width: 200px;}
-    #overlay_list_of_speaker_box h3 {
-        margin: 5px;}
-    #overlay_list_of_speaker_box ul {
-        list-style-type: none;
-        margin: 5px;}
-    #overlay_list_of_speaker_box li {
-        font-size: 120%;
-        line-height: 120%;}
-    #overlay_list_of_speaker_box .old_speaker {
-        color: #777777;}
-    #overlay_list_of_speaker_box .actual_speaker {
-        font-weight: bold;
-        margin-bottom: 0em;}
-</style>
-
 <div id="overlay_list_of_speaker_box">
     <h3>{% trans "List of speakers" %} {% if closed %}(<span class="closed">{% trans 'closed' %}</span>){% endif %}</h3>
     {% if list_of_speakers %}

openslides/agenda/templates/agenda/overview.html

@@ -7,20 +7,18 @@
 {% block title %}{% trans "Agenda" %} – {{ block.super }}{% endblock %}
 
 {% block header %}
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/agenda.css' %}" />
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/agenda_sort.css' %}" />
+    <link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda.css' %}" />
 {% endblock %}
 
 {% block javascript %}
-    <script type="text/javascript" src="{% static 'javascript/agenda.js' %}"></script>
-    <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/agenda.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/jquery/jquery.cookie.js' %}"></script>
     {% if perms.agenda.can_manage_agenda %}
-        <script type="text/javascript" src="{% static 'javascript/jquery.once.js' %}"></script>
-        <script type="text/javascript" src="{% static 'javascript/jquery-ui.custom.min.js' %}"></script>
-        <script type="text/javascript" src="{% static 'javascript/jquery.tmpl.js' %}"></script>
-        <script type="text/javascript" src="{% static 'javascript/jquery.mjs.nestedSortable.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/jquery/jquery-ui.custom.min.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/jquery/jquery.once.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/jquery/jquery.tmpl.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/jquery/jquery-ui-nestedSortable.js' %}"></script>
     {% endif %}
-    <script type="text/javascript" src="{% static 'javascript/agenda_sort.js' %}"></script>
 {% endblock %}
 
 {% block content %}

openslides/agenda/templates/agenda/view.html

@@ -7,13 +7,13 @@
 {% block title %}{{ item }} – {{ block.super }}{% endblock %}
 
 {% block header %}
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/agenda.css' %}" />
-    <link rel="stylesheet" href="{% static 'styles/jquery-ui/jquery-ui.custom.min.css' %}" />
+    <link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda.css' %}" />
+    <link rel="stylesheet" href="{% static 'css/jquery-ui/jquery-ui.custom.min.css' %}" />
 {% endblock %}
 
 {% block javascript %}
-    <script type="text/javascript" src="{% static 'javascript/jquery-ui.custom.min.js' %}"></script>
-    <script type="text/javascript" src="{% static 'javascript/agenda.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/jquery/jquery-ui.custom.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/agenda.js' %}"></script>
 {% endblock %}
 
 {% block content %}

openslides/assignment/static/css/assignment.css

@@ -1,3 +1,10 @@
+/*
+ * Styles for web interface of assignment app
+ *
+ */
+
+
+/* Navigation icons (mapping to glyphicons-halflings) */
 .icon-charts {
     background-image: url("../img/glyphicons_041_charts.png");
     background-position: 0px center;
@@ -6,10 +13,10 @@
     background-image: url("../img/glyphicons_041_charts_white.png");
 }
 
+/* Election result table */
 td.elected {
     background-color: #BED4DE !important;
 }
-
 td.elected a.election_link {
     background-image: url(../img/voting-yes.png);
     background-repeat: no-repeat;
@@ -20,7 +27,6 @@ td.elected a.election_link {
     margin-right: 5px;
     float: left;
 }
-
 td a.election_link {
     background-image: url(../img/voting-yes-grey.png);
     background-repeat: no-repeat;

openslides/assignment/static/js/assignment.js

@@ -1,3 +1,8 @@
+/*
+ * JavaScript functions for assignment.
+ *
+ */
+
 $(function() {
     $('a.elected').parent().parent().children('td').addClass('elected');
 
@@ -58,4 +63,5 @@ $(function() {
                 link.attr('href', data.link);
             }
         });
-    });});
+    });
+});

openslides/assignment/template.py

@@ -10,4 +10,4 @@ def add_assignment_stylesheets(sender, request, context, **kwargs):
     """
     Adds the assignment.css to the context.
     """
-    context['extra_stylefiles'].append('styles/assignment.css')
+    context['extra_stylefiles'].append('css/assignment.css')

openslides/assignment/templates/assignment/assignment_detail.html

@@ -8,11 +8,11 @@
 {% block title %}{% trans "Election" %} "{{ assignment }}" – {{ block.super }}{% endblock %}
 
 {% block header %}
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/assignment.css' %}" />
+    <link type="text/css" rel="stylesheet" media="all" href="{% static 'css/assignment.css' %}" />
 {% endblock %}
 
 {% block javascript %}
-    <script type="text/javascript" src="{% static 'javascript/assignment.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/assignment.js' %}"></script>
 {% endblock %}
 
 {% block content %}

openslides/assignment/templates/assignment/assignment_list.html

@@ -7,12 +7,12 @@
 {% block title %}{% trans "Elections" %} – {{ block.super }}{% endblock %}
 
 {% block header %}
-    <link href="{% static 'styles/dataTables/dataTables.bootstrap.css' %}" type="text/css" rel="stylesheet">
+    <link href="{% static 'css/dataTables/dataTables.bootstrap.css' %}" type="text/css" rel="stylesheet">
 {% endblock %}
 
 {% block javascript %}
-    <script src="{% static 'javascript/jquery.dataTables.min.js' %}" type="text/javascript"></script>
-    <script src="{% static 'javascript/dataTables.bootstrap.js' %}" type="text/javascript"></script>
+    <script src="{% static 'js/jquery/jquery.dataTables.min.js' %}" type="text/javascript"></script>
+    <script src="{% static 'js/jquery/dataTables.bootstrap.js' %}" type="text/javascript"></script>
 {% endblock %}
 
 {% block content %}

openslides/config/templates/config/config_form.html

@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
 {% load i18n %}
-{% load staticfiles %}
 
 {% block title %}{% trans "Configuration" %} – {{ block.super }}{% endblock %}
 

openslides/core/static/css/base.css

@@ -1,3 +1,8 @@
+/*
+ * OpenSlides default template styles of the web interface
+ *
+ */
+
 body {
    background-color: #FBFBFB;
 }
@@ -284,9 +289,6 @@ legend + .control-group {
 .leftmenu ul li.active a span.ico i.icon-agenda {
     background-image: url("../img/glyphicons_045_calendar_white.png");
 }
-.icon-motion, .icon-motions {
-    background-position: -24px -24px;
-}
 .icon-assignment, .icon-assignments {
     background-image: url("../img/glyphicons_041_charts.png");
     background-position: 0;

openslides/core/static/css/dashboard.css

@@ -1,4 +1,9 @@
-/** Widgets **/
+/*
+ * OpenSlides dashboard styles
+ *
+ */
+
+/*** Widgets ***/
 .column {
     width: 50%;
     float: left;
@@ -91,7 +96,7 @@
     width: 40px;
 }
 
-/* iframe */
+/*** iframe for live view ***/
 #iframe {
     width: 1024px;
     height: 768px;
@@ -124,6 +129,7 @@
     z-index: 1;
 }
 
+/*** misc ***/
 .custom-btn-mini {
     width: 20px;
 }

openslides/core/static/css/jquery-ui-timepicker.css

@@ -1,3 +1,8 @@
+/*
+ * jQuery UI timepicker styles
+ *
+ */
+
 .ui-timepicker-div .ui-widget-header {
     margin-bottom: 8px;
 }

openslides/core/static/css/jquery.bsmselect.css

@@ -1,3 +1,8 @@
+/*
+ * jQuery bsmSelect styles
+ *
+ */
+
 .bsmContainer {
   /* container that surrounds entire bsmSelect widget */
 }

openslides/core/static/js/ckeditor-config.js

@@ -7,7 +7,7 @@ var ck_options = {
         // using the editor. Using the CSS prefix class .ckeditor_html prevents these
         // styles from meddling with the main layout
 
-        contentsCss: "/static/styles/ckeditor.css",
+        contentsCss: "/static/css/ckeditor.css",
         bodyClass: "ckeditor_html",
 
         allowedContent: