Changeset 13935 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

14 Jun 2016, 01:38:12 (9 years ago)

Author:

uli

Message:

Merge changes from uli-scores-upload back into trunk.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/browser/viewlets.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py

@@ -18 +18 @@
 import grok
 from urllib import urlencode
+from zope.component import getMultiAdapter, queryAdapter, getUtility
 from zope.i18n import translate
-from zope.component import getMultiAdapter, queryAdapter, getUtility
 from zope.interface import Interface
 from zope.location.interfaces import ISite
 from zope.traversing.browser import absoluteURL
+from waeup.kofa.browser.interfaces import (
+    IFacultiesContainer, IFaculty, IDepartment, ICourse, ICertificate,
+    ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
+from waeup.kofa.browser.layout import KofaPage, default_primary_nav_template
 from waeup.kofa.browser.pages import (
     UniversityPage, FacultiesContainerPage, DatacenterPage, FacultyPage,
     DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage,
     UsersContainerPage, UserManageFormPage, DatacenterImportStep1)
-from waeup.kofa.students.browser import EditScoresPage
-from waeup.kofa.browser.interfaces import (
-    IFacultiesContainer, IFaculty, IDepartment, ICourse, ICertificate,
-    ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
+from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.interfaces import (
     IKofaUtils, IKofaObject,
     IDataCenter, IUserAccount)
-from waeup.kofa.browser.layout import KofaPage, default_primary_nav_template
 from waeup.kofa.utils.helpers import get_user_account
 
-from waeup.kofa.interfaces import MessageFactory as _
 
 grok.templatedir('templates')
 grok.context(IKofaObject) # Make IKofaObject the default context
 
+
 class ManageSidebar(grok.ViewletManager):
     grok.name('left_manage')
 
+
 class BreadCrumbManager(grok.ViewletManager):
     grok.name('breadcrumbs')
 
+
 class LanguageManager(grok.ViewletManager):
     grok.name('languages')
 
+
 class ActionBar(grok.ViewletManager):
     grok.name('actionbar')
 
+
 class AdministrationTasks(grok.ViewletManager):
     grok.name('admintasks')
 
+
 class WidgetsSlot(grok.ViewletManager):
     grok.name('widgets')
 
+
 class SourcesLeft(grok.ViewletManager):
     grok.name('sources_left')
+
 
 class SourcesRight(grok.ViewletManager):
@@ -555 +562 @@
     grok.order(4)
 
-class DownloadCSVFileActionButton(ManageActionButton):
-    """ 'Download csv file' button for courses.
-    """
-    grok.context(ICourse)
-    grok.view(EditScoresPage)
-    grok.name('downloadcsv')
-    grok.require('waeup.editScores')
-    icon = 'actionicon_down.png'
-    text = _('Download editable tickets')
-    target = 'download_scores'
-    grok.order(1)
-
-class DownloadTicketOverviewActionButton(ManageActionButton):
-    """ 'Download ticket overview' button for courses.
-    """
-    grok.context(ICourse)
-    grok.view(EditScoresPage)
-    grok.name('coursetickets')
-    grok.require('waeup.editScores')
-    icon = 'actionicon_pdf.png'
-    text = _('Download pdf file')
-    target = 'coursetickets.pdf'
-    grok.order(2)
 
 class ManageCertificateActionButton(ManageActionButton):