Merge pull request #1286 from normanjaeckel/CleanUpIcons

Cleaned up some widgets and the base.css. Removed icon definitions.
This commit is contained in:
Oskar Hahn 2014-05-15 17:49:05 +02:00
commit 2cd0a2007d
6 changed files with 10 additions and 39 deletions

View File

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

View File

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

View File

@ -1,6 +1,5 @@
/* /*
* OpenSlides default template styles of the web interface * OpenSlides default template styles of the web interface
*
*/ */
body { body {
@ -277,50 +276,15 @@ legend + .control-group {
padding-right: 15px; 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-image: url("../img/glyphicons_041_charts.png");
background-position: 0; background-position: 0;
} }
.leftmenu ul li.active a span.ico i.icon-assignment { .leftmenu ul li.active a span.ico i.icon-assignment {
background-image: url("../img/glyphicons_041_charts_white.png"); 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 { .status_link .icon-on, .icon-checked-new {
background-image: url("../img/glyphicons_152_check.png"); background-image: url("../img/glyphicons_152_check.png");
background-position: 0; background-position: 0;

View File

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

View File

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

View File

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