diff --git a/TODO.md b/TODO.md index 2557c795..d3210342 100644 --- a/TODO.md +++ b/TODO.md @@ -100,7 +100,7 @@ Remember that, as always with QuerySets, any subsequent chained methods which im * when using modeladmin to store shit like self.account, make sure to have a cleanslate in each request -*jabber with mailbox accounts (dovecto mail notification) +* jabber with mailbox accounts (dovecto mail notification) * rename accounts register to manager register or accounttools, accountutils diff --git a/orchestra/admin/options.py b/orchestra/admin/options.py index b3612763..e6a375a5 100644 --- a/orchestra/admin/options.py +++ b/orchestra/admin/options.py @@ -177,7 +177,8 @@ class SelectPluginAdminMixin(object): 'app_label': opts.app_label, 'field': self.plugin_field, 'field_name': opts.get_field_by_name(self.plugin_field)[0].verbose_name, - 'plugins': self.plugin.get_plugin_choices(), + 'plugin': self.plugin, + 'plugins': self.plugin.get_plugins(), } template = 'admin/orchestra/select_plugin.html' return render(request, template, context) diff --git a/orchestra/apps/saas/services/bscw.py b/orchestra/apps/saas/services/bscw.py index ab57bb37..8b4670af 100644 --- a/orchestra/apps/saas/services/bscw.py +++ b/orchestra/apps/saas/services/bscw.py @@ -16,3 +16,4 @@ class BSCWService(SoftwareService): verbose_name = "BSCW" form = BSCWForm description_field = 'username' + icon = 'saas/icons/BSCW.png' diff --git a/orchestra/apps/saas/services/dokuwiki.py b/orchestra/apps/saas/services/dokuwiki.py index 93690fd4..ad8aa9b6 100644 --- a/orchestra/apps/saas/services/dokuwiki.py +++ b/orchestra/apps/saas/services/dokuwiki.py @@ -17,3 +17,4 @@ class DokuwikiService(SoftwareService): verbose_name = "Dowkuwiki" form = DowkuwikiForm description_field = 'site_name' + icon = 'saas/icons/Dokuwiki.png' diff --git a/orchestra/apps/saas/services/drupal.py b/orchestra/apps/saas/services/drupal.py index 05318e21..4077983d 100644 --- a/orchestra/apps/saas/services/drupal.py +++ b/orchestra/apps/saas/services/drupal.py @@ -17,3 +17,4 @@ class DrupalService(SoftwareService): verbose_name = "Drupal" form = DrupalForm description_field = 'site_name' + icon = 'saas/icons/Drupal.png' diff --git a/orchestra/apps/saas/services/gitlab.py b/orchestra/apps/saas/services/gitlab.py index 1510d436..bbb4d5fd 100644 --- a/orchestra/apps/saas/services/gitlab.py +++ b/orchestra/apps/saas/services/gitlab.py @@ -17,3 +17,4 @@ class GitLabService(SoftwareService): verbose_name = "GitLab" form = GitLabForm description_field = 'project_name' + icon = 'saas/icons/gitlab.png' diff --git a/orchestra/apps/saas/services/moodle.py b/orchestra/apps/saas/services/moodle.py index 17e6da0c..a5d5051a 100644 --- a/orchestra/apps/saas/services/moodle.py +++ b/orchestra/apps/saas/services/moodle.py @@ -17,3 +17,4 @@ class MoodleService(SoftwareService): verbose_name = "Moodle" form = MoodleForm description_field = 'site_name' + icon = 'saas/icons/Moodle.png' diff --git a/orchestra/apps/saas/services/options.py b/orchestra/apps/saas/services/options.py index 13f1c09b..f38e5cf5 100644 --- a/orchestra/apps/saas/services/options.py +++ b/orchestra/apps/saas/services/options.py @@ -12,6 +12,8 @@ class SoftwareService(plugins.Plugin): description_field = '' form = None serializer = None + icon = 'orchestra/icons/apps.png' + class_verbose_name = _("Software as a Service") @classmethod @cached diff --git a/orchestra/apps/saas/services/phplist.py b/orchestra/apps/saas/services/phplist.py index b1dddc26..abf1d2e8 100644 --- a/orchestra/apps/saas/services/phplist.py +++ b/orchestra/apps/saas/services/phplist.py @@ -14,3 +14,4 @@ class PHPListService(SoftwareService): verbose_name = "phpList" form = PHPListForm description_field = 'email' + icon = 'saas/icons/Phplist.png' diff --git a/orchestra/apps/saas/services/wordpress.py b/orchestra/apps/saas/services/wordpress.py index 677b86bd..fd5bbde5 100644 --- a/orchestra/apps/saas/services/wordpress.py +++ b/orchestra/apps/saas/services/wordpress.py @@ -15,6 +15,7 @@ class WordpressForm(PluginDataForm): class WordpressService(SoftwareService): - verbose_name = "Wordpress" + verbose_name = "WordPress" form = WordpressForm description_field = 'site_name' + icon = 'saas/icons/WordPress.png' diff --git a/orchestra/apps/saas/static/saas/icons/BSCW.png b/orchestra/apps/saas/static/saas/icons/BSCW.png new file mode 100644 index 00000000..dea483d9 Binary files /dev/null and b/orchestra/apps/saas/static/saas/icons/BSCW.png differ diff --git a/orchestra/apps/saas/static/saas/icons/Dokuwiki.png b/orchestra/apps/saas/static/saas/icons/Dokuwiki.png new file mode 100644 index 00000000..6a7fbf98 Binary files /dev/null and b/orchestra/apps/saas/static/saas/icons/Dokuwiki.png differ diff --git a/orchestra/apps/saas/static/saas/icons/Dokuwiki.svg b/orchestra/apps/saas/static/saas/icons/Dokuwiki.svg index cbee241e..cd6904b7 100644 --- a/orchestra/apps/saas/static/saas/icons/Dokuwiki.svg +++ b/orchestra/apps/saas/static/saas/icons/Dokuwiki.svg @@ -10,14 +10,17 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="128.00854" - height="128.51692" + width="48" + height="48" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46+devel r21627" - sodipodi:docname="dokuwiki.svg" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="Dokuwiki.svg" version="1.1" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/glic3/orchestra/django-orchestra/orchestra/apps/saas/static/saas/icons/Dokuwiki.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + transform="matrix(1.1,0,0,1.1,-5.5,0)" + inkscape:connector-curvature="0" /> @@ -394,15 +399,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.734697" - inkscape:cx="35.103028" - inkscape:cy="81.524672" + inkscape:zoom="5.2816591" + inkscape:cx="46.937409" + inkscape:cy="51.230756" inkscape:document-units="px" inkscape:current-layer="layer3" inkscape:window-width="1206" inkscape:window-height="855" inkscape:window-x="0" - inkscape:window-y="0" + inkscape:window-y="27" showguides="true" inkscape:guide-bbox="true" showgrid="false" @@ -415,6 +420,7 @@ image/svg+xml + @@ -423,9 +429,10 @@ id="layer3" inkscape:label="paper" style="display:inline" - transform="translate(-158.14742,-158.45341)"> + transform="translate(-158.14742,-238.97033)"> + id="g1419" + transform="matrix(0.3463897,0,0,0.3463897,105.30454,185.54142)"> + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + transform="matrix(0.995433,-0.09546066,0.09546066,0.995433,0,0)" + inkscape:connector-curvature="0" /> @@ -458,23 +469,27 @@ style="fill:url(#linearGradient2606);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker-end:none" d="m 174.75585,201.60224 c -6.04576,2.46667 -10.16789,4.4194 -12.88454,6.35064 -2.71665,1.93124 -3.19257,4.60007 -3.24631,6.26587 -0.0269,0.8329 0.0809,1.77774 0.63189,2.44014 0.55103,0.6624 1.80769,1.87421 2.75794,2.38558 1.90049,1.02274 7.5417,2.42901 10.51899,3.07308 11.90917,2.57627 26.80568,1.68117 26.80568,1.68117 1.69307,1.2452 2.83283,2.82434 3.269,4.26902 4.5766,-1.88674 11.81084,-6.58439 13.15657,-8.57706 -5.45142,-4.19955 -10.79692,-6.33346 -16.51317,-8.30847 -1.59867,-0.71918 -2.87956,-1.22649 -0.71773,2.55635 0.98506,2.47275 0.85786,5.05143 0.57176,7.41825 0,0 -16.52749,0.40678 -28.23838,-2.1266 -2.92772,-0.63334 -5.46627,-0.95523 -7.21875,-1.89832 -0.87624,-0.47154 -1.48296,-0.8208 -1.91578,-1.3411 -0.43282,-0.5203 -0.2196,-1.29055 -0.20128,-1.85858 0.0366,-1.13607 0.25336,-1.67063 2.86177,-3.52492 2.60841,-1.85429 5.65407,-3.36195 11.65936,-5.81211 -0.0877,-1.29125 -0.29025,-2.5059 -1.29702,-2.99294 z" id="path2414" - sodipodi:nodetypes="csssssccccccssssscc" /> + sodipodi:nodetypes="csssssccccccssssscc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccsssscccccssssc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="csscccccsscc" + inkscape:connector-curvature="0" /> + style="fill:url(#linearGradient2395);fill-opacity:1;stroke:none;display:inline" + inkscape:connector-curvature="0" /> @@ -482,32 +497,38 @@ style="fill:url(#radialGradient2647);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 232.55816,219.5295 -15.92827,0.32199 3.08809,-15.15716 12.84018,14.83517 z" id="path1443" - sodipodi:nodetypes="cccc" /> + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" /> diff --git a/orchestra/apps/saas/static/saas/icons/Drupal.png b/orchestra/apps/saas/static/saas/icons/Drupal.png new file mode 100644 index 00000000..2d8365ed Binary files /dev/null and b/orchestra/apps/saas/static/saas/icons/Drupal.png differ diff --git a/orchestra/apps/saas/static/saas/icons/Drupal.svg b/orchestra/apps/saas/static/saas/icons/Drupal.svg index 7da67bde..311500b9 100644 --- a/orchestra/apps/saas/static/saas/icons/Drupal.svg +++ b/orchestra/apps/saas/static/saas/icons/Drupal.svg @@ -1 +1,103 @@ -]>Druplicon \ No newline at end of file + + + + + + image/svg+xml + + Druplicon + + + + + + Druplicon + + + + + + + + + + diff --git a/orchestra/apps/saas/static/saas/icons/Moodle.png b/orchestra/apps/saas/static/saas/icons/Moodle.png new file mode 100644 index 00000000..a13964c5 Binary files /dev/null and b/orchestra/apps/saas/static/saas/icons/Moodle.png differ diff --git a/orchestra/apps/saas/static/saas/icons/Moodle.svg b/orchestra/apps/saas/static/saas/icons/Moodle.svg index 3ea6155d..7dc724d9 100644 --- a/orchestra/apps/saas/static/saas/icons/Moodle.svg +++ b/orchestra/apps/saas/static/saas/icons/Moodle.svg @@ -1,5 +1,6 @@ + + sodipodi:docname="Moodle.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/glic3/orchestra/django-orchestra/orchestra/apps/saas/static/saas/icons/Moodle.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:window-width="1920" + inkscape:window-height="1024" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" /> + d="m 130.32,642 331.92,0 0,11.04 -331.92,0 0,-11.04 z" + inkscape:connector-curvature="0" /> + id="filter3416" + color-interpolation-filters="sRGB"> + d="m 519.375,8.375 0,67 c -8.3124,-7.708675 -18.91192,-12.343754 -30.46875,-12.34375 -26.67332,-2e-6 -48.3125,24.61839 -48.3125,54.96875 -10e-6,30.35035 21.63918,54.96876 48.3125,54.96875 11.55683,0 22.15634,-4.63508 30.46875,-12.34375 l 0,9.53125 30.46875,0 0,-161.78125 -30.46875,0 z m 47.46875,0 0,161.78125 30.5,0 0,-161.78125 -30.5,0 z m -298.9375,54.0625 c -30.33618,2e-6 -54.96875,25.12026 -54.96875,56.125 1e-5,31.00475 24.63256,56.15625 54.96875,56.15625 30.33618,1e-5 54.9375,-25.1515 54.9375,-56.15625 -10e-6,-31.004741 -24.60133,-56.125 -54.9375,-56.125 z m 113.71875,0 c -30.33617,2e-6 -54.96875,25.12026 -54.96875,56.125 -2e-5,31.00475 24.63256,56.15625 54.96875,56.15625 30.33619,1e-5 54.9375,-25.1515 54.9375,-56.15625 0,-31.004741 -24.60133,-56.125 -54.9375,-56.125 z m 280.21875,0 c -31.30685,2e-6 -56.75,25.77988 -56.75,57.59375 0,31.81388 25.44315,57.625 56.75,57.625 24.51659,1e-5 45.40735,-15.82396 53.3125,-37.96875 l -31.65625,0 c -4.68373,9.44879 -12.62284,15.6875 -21.65625,15.6875 -12.08775,0 -22.30022,-11.15315 -25.28125,-26.25 l 37.5625,0 0,-1.75 43.9375,0 c 0.3018,-2.40763 0.46875,-4.85303 0.46875,-7.34375 -2e-5,-31.813871 -25.38067,-57.59375 -56.6875,-57.59375 z M 94.875,64.15625 c -30.42409,0.33968 -41.02701,14.55616 -43.1875,34.5 l 0.5,0 0,71.5 30.46875,0 0,-71.5 1.15625,0 C 87.42654,91.67994 92.84159,87.25 98.875,87.25 c 5.91375,0 11.22498,4.261773 14.84375,11 l 0,71.90625 30.5,0 0,-71.5 0.46875,0 C 148.30911,91.679939 153.71659,87.25 159.75,87.25 c 6.03341,10e-7 11.44846,4.42994 15.0625,11.40625 l 1.0625,0 0,71.5 30.46875,0 0,-71.5 0.59375,0 c -2.16049,-19.943838 -12.76341,-34.160324 -43.1875,-34.5 -1.29771,-0.01449 -2.62932,-0.0054 -4,0.03125 -11.61263,10e-7 -22.22994,4.954774 -30.4375,13.15625 C 121.10494,69.142273 110.48762,64.1875 98.875,64.1875 c -1.37068,-0.03664 -2.70229,-0.04574 -4,-0.03125 z M 495.5625,84.1875 c 11.37467,-3e-6 20.94908,10.370131 23.8125,24.4375 l 0,17.53125 c -2.86344,14.06737 -12.43786,24.40625 -23.8125,24.40625 -13.6325,-1e-5 -24.6875,-14.87512 -24.6875,-33.1875 0,-18.312377 11.05498,-33.1875 24.6875,-33.1875 z m 166.28125,0.53125 c 11.46607,2e-6 21.18431,9.99825 24.6875,23.90625 l -49.4375,0 c 3.51938,-13.907998 13.28392,-23.90625 24.75,-23.90625 z m -393.9375,1.125 c 12.71411,-2e-6 23.03125,14.65618 23.03125,32.71875 0,18.06258 -10.31714,32.75 -23.03125,32.75 -12.71412,-1e-5 -23.0625,-14.68742 -23.0625,-32.75 0,-18.06256 10.34839,-32.71875 23.0625,-32.71875 z m 113.71875,0 c 12.71412,-2e-6 23.03125,14.65618 23.03125,32.71875 -2e-5,18.06258 -10.31714,32.75 -23.03125,32.75 -12.71411,-1e-5 -23.03125,-14.68742 -23.03125,-32.75 0,-18.06256 10.31714,-32.71875 23.03125,-32.71875 z" + style="fill:#fb9c02;fill-opacity:1;stroke:none" + inkscape:connector-curvature="0" /> + y="-0.5" + color-interpolation-filters="sRGB"> @@ -121,49 +130,51 @@ + style="fill:#fb9c02;fill-opacity:1;stroke:none" + d="m 519.375,8.375 0,67 c -8.3124,-7.708675 -18.91192,-12.343754 -30.46875,-12.34375 -26.67332,-2e-6 -48.3125,24.61839 -48.3125,54.96875 -10e-6,30.35035 21.63918,54.96876 48.3125,54.96875 11.55683,0 22.15634,-4.63508 30.46875,-12.34375 l 0,9.53125 30.46875,0 0,-161.78125 -30.46875,0 z m 47.46875,0 0,161.78125 30.5,0 0,-161.78125 -30.5,0 z m -298.9375,54.0625 c -30.33618,2e-6 -54.96875,25.12026 -54.96875,56.125 1e-5,31.00475 24.63256,56.15625 54.96875,56.15625 30.33618,1e-5 54.9375,-25.1515 54.9375,-56.15625 -10e-6,-31.004741 -24.60133,-56.125 -54.9375,-56.125 z m 113.71875,0 c -30.33617,2e-6 -54.96875,25.12026 -54.96875,56.125 -2e-5,31.00475 24.63256,56.15625 54.96875,56.15625 30.33619,1e-5 54.9375,-25.1515 54.9375,-56.15625 0,-31.004741 -24.60133,-56.125 -54.9375,-56.125 z m 280.21875,0 c -31.30685,2e-6 -56.75,25.77988 -56.75,57.59375 0,31.81388 25.44315,57.625 56.75,57.625 24.51659,1e-5 45.40735,-15.82396 53.3125,-37.96875 l -31.65625,0 c -4.68373,9.44879 -12.62284,15.6875 -21.65625,15.6875 -12.08775,0 -22.30022,-11.15315 -25.28125,-26.25 l 80.9138,-0.5776 c 0.3018,-2.40763 1.05495,-6.02543 1.05495,-8.51615 -2e-5,-31.813871 -25.38067,-57.59375 -56.6875,-57.59375 z M 94.875,64.15625 c -30.42409,0.33968 -41.02701,14.55616 -43.1875,34.5 l 0.5,0 0,71.5 30.46875,0 0,-71.5 1.15625,0 C 87.42654,91.67994 92.84159,87.25 98.875,87.25 c 5.91375,0 11.22498,4.261773 14.84375,11 l 0,71.90625 30.5,0 0,-71.5 0.46875,0 C 148.30911,91.679939 153.71659,87.25 159.75,87.25 c 6.03341,10e-7 11.44846,4.42994 15.0625,11.40625 l 1.0625,0 0,71.5 30.46875,0 0,-71.5 0.59375,0 c -2.16049,-19.943838 -12.76341,-34.160324 -43.1875,-34.5 -1.29771,-0.01449 -2.62932,-0.0054 -4,0.03125 -11.61263,10e-7 -22.22994,4.954774 -30.4375,13.15625 C 121.10494,69.142273 110.48762,64.1875 98.875,64.1875 c -1.37068,-0.03664 -2.70229,-0.04574 -4,-0.03125 z M 495.5625,84.1875 c 11.37467,-3e-6 20.94908,10.370131 23.8125,24.4375 l 0,17.53125 c -2.86344,14.06737 -12.43786,24.40625 -23.8125,24.40625 -13.6325,-1e-5 -24.6875,-14.87512 -24.6875,-33.1875 0,-18.312377 11.05498,-33.1875 24.6875,-33.1875 z m 166.28125,0.53125 c 11.46607,2e-6 21.18431,9.99825 24.6875,23.90625 l -49.4375,0 c 3.51938,-13.907998 13.28392,-23.90625 24.75,-23.90625 z m -393.9375,1.125 c 12.71411,-2e-6 23.03125,14.65618 23.03125,32.71875 0,18.06258 -10.31714,32.75 -23.03125,32.75 -12.71412,-1e-5 -23.0625,-14.68742 -23.0625,-32.75 0,-18.06256 10.34839,-32.71875 23.0625,-32.71875 z m 113.71875,0 c 12.71412,-2e-6 23.03125,14.65618 23.03125,32.71875 -2e-5,18.06258 -10.31714,32.75 -23.03125,32.75 -12.71411,-1e-5 -23.03125,-14.68742 -23.03125,-32.75 0,-18.06256 10.31714,-32.71875 23.03125,-32.71875 z" + id="path2586" + inkscape:connector-curvature="0" /> + width="2" + height="2" + id="filterK" + color-interpolation-filters="sRGB"> + + - - + r="63.818954" /> @@ -173,6 +184,7 @@ image/svg+xml + @@ -180,54 +192,67 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0.1900293,-428.7894)"> - - + transform="translate(0.1900293,-575.57279)"> + id="g3018" + transform="matrix(0.2611912,0,0,0.2611912,-6.7137518,460.28363)"> + + - - + style="opacity:0.6" + clip-path="url(#clipPathd)" + id="g4159"> + + + + + + + + - - - - diff --git a/orchestra/apps/saas/static/saas/icons/Phplist.png b/orchestra/apps/saas/static/saas/icons/Phplist.png new file mode 100644 index 00000000..cfb49ad8 Binary files /dev/null and b/orchestra/apps/saas/static/saas/icons/Phplist.png differ diff --git a/orchestra/apps/saas/static/saas/icons/Phplist.svg b/orchestra/apps/saas/static/saas/icons/Phplist.svg new file mode 100644 index 00000000..6886fbea --- /dev/null +++ b/orchestra/apps/saas/static/saas/icons/Phplist.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml + + + + + \ No newline at end of file diff --git a/orchestra/apps/saas/static/saas/icons/WordPress.png b/orchestra/apps/saas/static/saas/icons/WordPress.png new file mode 100644 index 00000000..43f07235 Binary files /dev/null and b/orchestra/apps/saas/static/saas/icons/WordPress.png differ diff --git a/orchestra/apps/saas/static/saas/icons/WordPress.svg b/orchestra/apps/saas/static/saas/icons/WordPress.svg index 8628e3ad..d7436e2e 100644 --- a/orchestra/apps/saas/static/saas/icons/WordPress.svg +++ b/orchestra/apps/saas/static/saas/icons/WordPress.svg @@ -1,68 +1,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orchestra/apps/saas/static/saas/icons/gitlab.png b/orchestra/apps/saas/static/saas/icons/gitlab.png index 09b1689c..a4962f41 100644 Binary files a/orchestra/apps/saas/static/saas/icons/gitlab.png and b/orchestra/apps/saas/static/saas/icons/gitlab.png differ diff --git a/orchestra/apps/systemusers/admin.py b/orchestra/apps/systemusers/admin.py index ef3d3efe..a4f6a2d6 100644 --- a/orchestra/apps/systemusers/admin.py +++ b/orchestra/apps/systemusers/admin.py @@ -14,8 +14,8 @@ from .models import SystemUser class SystemUserAdmin(ChangePasswordAdminMixin, SelectAccountAdminMixin, ExtendedModelAdmin): - list_display = ('username', 'account_link', 'shell', 'home', 'is_active',) - list_filter = ('is_active', 'shell') + list_display = ('username', 'account_link', 'shell', 'home', 'is_active', 'is_main') + list_filter = ('is_active', 'is_main', 'shell') fieldsets = ( (None, { 'fields': ('username', 'password', 'account_link', 'is_active') diff --git a/orchestra/apps/webapps/settings.py b/orchestra/apps/webapps/settings.py index 28254331..770a1227 100644 --- a/orchestra/apps/webapps/settings.py +++ b/orchestra/apps/webapps/settings.py @@ -42,26 +42,26 @@ WEBAPPS_TYPES = getattr(settings, 'WEBAPPS_TYPES', { _("This creates a Static application under ~/webapps/\n" "Apache2 will be used to serve static content and execute CGI files.") ), - 'wordpressmu': ( - _("Wordpress (shared)"), - 'fpm', ('fcgi://127.0.0.1:8990/home/httpd/wordpress-mu/',), - _("This creates a Wordpress site into a shared Wordpress server\n" - "By default this blog will be accessible via http://.blogs.example.com") - - ), - 'dokuwikimu': ( - _("DokuWiki (shared)"), - 'alias', ('/home/httpd/wikifarm/farm/',), - _("This create a Dokuwiki wiki into a shared Dokuwiki server\n") - ), - 'drupalmu': ( - _("Drupdal (shared)"), - 'fpm', ('fcgi://127.0.0.1:8991/home/httpd/drupal-mu/',), - _("This creates a Drupal site into a shared Drupal server\n" - "The installation will be completed after visiting " - "http://.drupal.example.com/install.php?profile=standard&locale=ca\n" - "By default this site will be accessible via http://.drupal.example.com") - ), +# 'wordpress': ( +# _("Wordpress"), +# 'fpm', ('fcgi://127.0.0.1:8990/home/httpd/wordpress-mu/',), +# _("This creates a Wordpress site into a shared Wordpress server\n" +# "By default this blog will be accessible via http://.blogs.example.com") +# +# ), +# 'dokuwiki': ( +# _("DokuWiki"), +# 'alias', ('/home/httpd/wikifarm/farm/',), +# _("This create a Dokuwiki wiki into a shared Dokuwiki server\n") +# ), +# 'drupal': ( +# _("Drupdal"), +# 'fpm', ('fcgi://127.0.0.1:8991/home/httpd/drupal-mu/',), +# _("This creates a Drupal site into a shared Drupal server\n" +# "The installation will be completed after visiting " +# "http://.drupal.example.com/install.php?profile=standard&locale=ca\n" +# "By default this site will be accessible via http://.drupal.example.com") +# ), 'webalizer': ( _("Webalizer"), 'alias', ('%(app_path)s%(site_name)s',), diff --git a/orchestra/static/orchestra/icons/apps.png b/orchestra/static/orchestra/icons/apps.png index 85a372f6..cdba7a70 100644 Binary files a/orchestra/static/orchestra/icons/apps.png and b/orchestra/static/orchestra/icons/apps.png differ diff --git a/orchestra/static/orchestra/icons/apps.svg b/orchestra/static/orchestra/icons/apps.svg index 741e1198..b6657ce5 100644 --- a/orchestra/static/orchestra/icons/apps.svg +++ b/orchestra/static/orchestra/icons/apps.svg @@ -16,7 +16,7 @@ version="1.1" inkscape:version="0.48.3.1 r9886" sodipodi:docname="apps.svg" - inkscape:export-filename="/home/glic3rinu/orchestra/django-orchestra/orchestra/static/orchestra/icons/apps.png" + inkscape:export-filename="/home/glic3/orchestra/django-orchestra/orchestra/static/orchestra/icons/apps.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + + + inkscape:window-width="1920" + inkscape:window-height="1024" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" /> @@ -442,77 +462,70 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> + id="g2791" + transform="matrix(0.9994338,0,0,0.9994338,-0.63170202,-3.669718)"> - - - - - - - - - - - - - + id="g3305" + style="opacity:0.4" + transform="matrix(0.99266,0,0,0.97615,0.27519,1.293)"> + + + + + + + + + + + diff --git a/orchestra/templates/admin/orchestra/select_plugin.html b/orchestra/templates/admin/orchestra/select_plugin.html index 7f6540f7..dbe419b6 100644 --- a/orchestra/templates/admin/orchestra/select_plugin.html +++ b/orchestra/templates/admin/orchestra/select_plugin.html @@ -1,5 +1,10 @@ {% extends "admin/orchestra/generic_confirmation.html" %} -{% load i18n l10n staticfiles admin_urls %} +{% load i18n l10n staticfiles admin_urls admin_tools_dashboard_tags %} + +{% block extrastyle %} +{{ block.super }} +{% block dashboard_css %}{% admin_tools_render_dashboard_css %}{% endblock %} +{% endblock %} {% block content %} @@ -7,11 +12,26 @@
{% csrf_token %}
{% endblock %} diff --git a/orchestra/utils/plugins.py b/orchestra/utils/plugins.py index 330fde57..bba8312b 100644 --- a/orchestra/utils/plugins.py +++ b/orchestra/utils/plugins.py @@ -3,6 +3,9 @@ from .functional import cached class Plugin(object): verbose_name = None + # Used on select plugin view + class_verbose_name = None + icon = None @classmethod def get_plugin_name(cls):