Merge pull request #1286 from normanjaeckel/CleanUpIcons

Cleaned up some widgets and the base.css. Removed icon definitions.

openslides/account/widgets.py

@@ -17,6 +17,7 @@ class PersonalInfoWidget(Widget):
     default_column = 1
     default_weight = 80
     template_name = 'account/widget_personal_info.html'
+    icon_css_class = 'icon-flag'
 
     def check_permission(self):
         """

openslides/agenda/widgets.py

@@ -18,6 +18,7 @@ class AgendaWidget(Widget):
     default_column = 1
     default_weight = 20
     template_name = 'agenda/widget_item.html'
+    icon_css_class = 'icon-calendar'
     more_link_pattern_name = 'item_overview'
 
     def get_context_data(self, **context):
@@ -44,6 +45,7 @@ class ListOfSpeakersWidget(Widget):
     default_column = 1
     default_weight = 30
     template_name = 'agenda/widget_list_of_speakers.html'
+    icon_css_class = 'icon-bell'
 
     def check_permission(self):
         return (self.request.user.has_perm('agenda.can_manage_agenda') or

openslides/core/static/css/base.css

@@ -1,6 +1,5 @@
 /*
  * OpenSlides default template styles of the web interface
- *
  */
 
 body {
@@ -277,50 +276,15 @@ legend + .control-group {
     padding-right: 15px;
 }
 
-/** Navigation icons (mapping to glyphicons-halflings) **/
+/** Icons **/
-.icon-dashboard {
+/* TODO: Move some of them to the respective apps. */
-    background-position: 0 -24px;
+.icon-assignment {
-}
-.icon-agenda {
-    background-position: 0;
-    background-image: url("../img/glyphicons_045_calendar.png");
-}
-.leftmenu ul li.active a span.ico i.icon-agenda {
-    background-image: url("../img/glyphicons_045_calendar_white.png");
-}
-.icon-assignment, .icon-assignments {
     background-image: url("../img/glyphicons_041_charts.png");
     background-position: 0;
 }
 .leftmenu ul li.active a span.ico i.icon-assignment {
     background-image: url("../img/glyphicons_041_charts_white.png");
 }
-.icon-participant, .icon-participants {
-    background-position: -168px 0;
-}
-.icon-config {
-    background-position: -432px 0px;
-}
-.icon-live_view {
-    background-position: -432px -48px;
-}
-.icon-overlays {
-    background-position: -120px 0px;
-}
-.icon-custom_slide {
-    background-position: -120px 0px;
-}
-.icon-personal_info {
-    background-position: -312px -24px;
-}
-.icon-append_to_list_of_speakers {
-    background-position: -48px -144px;
-}
-.icon-presentations {
-    background-position: -264px -48px;
-}
-
-/** More glyphicons free icons **/
 .status_link .icon-on, .icon-checked-new {
     background-image: url("../img/glyphicons_152_check.png");
     background-position: 0;

openslides/core/widgets.py

@@ -35,6 +35,7 @@ class CustonSlideWidget(Widget):
     default_weight = 30
     template_name = 'core/widget_customslide.html'
     context = None
+    icon_css_class = 'icon-star'
 
     def get_context_data(self, **context):
         return super(CustonSlideWidget, self).get_context_data(

openslides/mediafile/widgets.py

@@ -18,6 +18,7 @@ class PDFPresentationWidget(Widget):
     default_column = 1
     default_weight = 75
     template_name = 'mediafile/widget_pdfpresentation.html'
+    icon_css_class = 'icon-align-left'
     more_link_pattern_name = 'mediafile_list'
     # javascript_files = None  # TODO: Add pdf.js stuff here.
 

openslides/projector/widgets.py

@@ -18,6 +18,7 @@ class ProjectorLiveWidget(Widget):
     default_column = 2
     default_weight = 10
     template_name = 'projector/widget_live_view.html'
+    icon_css_class = 'icon-facetime-video'
 
 
 class OverlayWidget(Widget):
@@ -30,6 +31,7 @@ class OverlayWidget(Widget):
     default_column = 2
     default_weight = 20
     template_name = 'projector/widget_overlay.html'
+    icon_css_class = 'icon-star'
 
     def get_context_data(self, **context):
         """