From 021a48c843e387d021b210b82345842eac3fade7 Mon Sep 17 00:00:00 2001 From: Issac Kelly Date: Fri, 25 Mar 2011 18:02:43 -0400 Subject: [PATCH] Fix the fixture, and update for django 1.3, add dist and egg-info to gitignore --- .gitignore | 2 + MANIFEST.in | 2 +- docs/install.rst | 4 +- helpdesk/fixtures/initial_data.json | 1 - helpdesk/htdocs/attachments/README.txt | 1 - .../helpdesk}/buttons/accept.png | Bin .../helpdesk}/buttons/button_template.psd | Bin .../helpdesk}/buttons/button_template.txt | 0 .../helpdesk}/buttons/delete.png | Bin .../helpdesk}/buttons/edit.png | Bin .../helpdesk}/buttons/take.png | Bin .../{htdocs => static/helpdesk}/filter.js | 0 .../{htdocs => static/helpdesk}/helpdesk.css | 0 helpdesk/{htdocs => static/helpdesk}/hover.js | 0 .../helpdesk}/jquery-1.5.min.js | 0 .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_75_ffffff_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_2e83ff_256x240.png | Bin .../images/ui-icons_454545_256x240.png | Bin .../images/ui-icons_888888_256x240.png | Bin .../images/ui-icons_cd0a0a_256x240.png | Bin .../jquery-ui-1.8.9.custom.css | 0 .../helpdesk}/jquery-ui-1.8.9.custom.min.js | 0 .../helpdesk}/jquery.jqplot/excanvas.min.js | 0 .../jquery.jqplot/jquery.jqplot.min.css | 0 .../jquery.jqplot/jquery.jqplot.min.js | 0 .../plugins/jqplot.BezierCurveRenderer.min.js | 0 .../plugins/jqplot.barRenderer.min.js | 0 .../plugins/jqplot.blockRenderer.min.js | 0 .../plugins/jqplot.bubbleRenderer.min.js | 0 .../jqplot.canvasAxisLabelRenderer.min.js | 0 .../jqplot.canvasAxisTickRenderer.min.js | 0 .../plugins/jqplot.canvasTextRenderer.min.js | 0 .../jqplot.categoryAxisRenderer.min.js | 0 .../plugins/jqplot.cursor.min.js | 0 .../plugins/jqplot.dateAxisRenderer.min.js | 0 .../plugins/jqplot.donutRenderer.min.js | 0 .../plugins/jqplot.dragable.min.js | 0 .../jqplot.enhancedLegendRenderer.min.js | 0 .../plugins/jqplot.funnelRenderer.min.js | 0 .../plugins/jqplot.highlighter.min.js | 0 .../plugins/jqplot.logAxisRenderer.min.js | 0 .../plugins/jqplot.mekkoAxisRenderer.min.js | 0 .../plugins/jqplot.mekkoRenderer.min.js | 0 .../plugins/jqplot.meterGaugeRenderer.min.js | 0 .../plugins/jqplot.ohlcRenderer.min.js | 0 .../plugins/jqplot.pieRenderer.min.js | 0 .../plugins/jqplot.pointLabels.min.js | 0 .../plugins/jqplot.trendline.min.js | 0 .../helpdesk}/priorities/priority1.png | Bin .../helpdesk}/priorities/priority2.png | Bin .../helpdesk}/priorities/priority3.png | Bin .../helpdesk}/priorities/priority4.png | Bin .../helpdesk}/priorities/priority5.png | Bin .../helpdesk}/priorities/readme.txt | 0 .../{htdocs => static/helpdesk}/rss_icon.png | Bin helpdesk/templates/helpdesk/base.html | 10 +- helpdesk/templates/helpdesk/dashboard.html | 2 +- helpdesk/templates/helpdesk/public_base.html | 4 +- .../helpdesk/public_view_ticket.html | 2 +- helpdesk/templates/helpdesk/rss_list.html | 10 +- helpdesk/templates/helpdesk/ticket.html | 2 +- .../templates/helpdesk/ticket_desc_table.html | 4 +- helpdesk/templates/helpdesk/ticket_list.html | 4 +- setup.py | 99 +++++++++++++++++- 72 files changed, 121 insertions(+), 26 deletions(-) delete mode 100644 helpdesk/htdocs/attachments/README.txt rename helpdesk/{htdocs => static/helpdesk}/buttons/accept.png (100%) rename helpdesk/{htdocs => static/helpdesk}/buttons/button_template.psd (100%) rename helpdesk/{htdocs => static/helpdesk}/buttons/button_template.txt (100%) rename helpdesk/{htdocs => static/helpdesk}/buttons/delete.png (100%) rename helpdesk/{htdocs => static/helpdesk}/buttons/edit.png (100%) rename helpdesk/{htdocs => static/helpdesk}/buttons/take.png (100%) rename helpdesk/{htdocs => static/helpdesk}/filter.js (100%) rename helpdesk/{htdocs => static/helpdesk}/helpdesk.css (100%) rename helpdesk/{htdocs => static/helpdesk}/hover.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-1.5.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_glass_75_dadada_1x400.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-icons_222222_256x240.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-icons_2e83ff_256x240.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-icons_454545_256x240.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-icons_888888_256x240.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/images/ui-icons_cd0a0a_256x240.png (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-smoothness-theme/jquery-ui-1.8.9.custom.css (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery-ui-1.8.9.custom.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/excanvas.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/jquery.jqplot.min.css (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/jquery.jqplot.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.BezierCurveRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.barRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.blockRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.bubbleRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.canvasTextRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.categoryAxisRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.cursor.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.dateAxisRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.donutRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.dragable.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.enhancedLegendRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.funnelRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.highlighter.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.logAxisRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.mekkoAxisRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.mekkoRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.meterGaugeRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.ohlcRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.pieRenderer.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.pointLabels.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/jquery.jqplot/plugins/jqplot.trendline.min.js (100%) rename helpdesk/{htdocs => static/helpdesk}/priorities/priority1.png (100%) rename helpdesk/{htdocs => static/helpdesk}/priorities/priority2.png (100%) rename helpdesk/{htdocs => static/helpdesk}/priorities/priority3.png (100%) rename helpdesk/{htdocs => static/helpdesk}/priorities/priority4.png (100%) rename helpdesk/{htdocs => static/helpdesk}/priorities/priority5.png (100%) rename helpdesk/{htdocs => static/helpdesk}/priorities/readme.txt (100%) rename helpdesk/{htdocs => static/helpdesk}/rss_icon.png (100%) diff --git a/.gitignore b/.gitignore index fb0cac62..692e7ade 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.pyc +dist +django_helpdesk.egg-info docs/html/* docs/doctrees/* diff --git a/MANIFEST.in b/MANIFEST.in index ea315679..c62f8817 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,7 @@ include UPGRADE include LICENSE* include CHANGELOG -recursive-include helpdesk/htdocs * +recursive-include helpdesk/static/helpdesk * recursive-include helpdesk/locale *.po *.mo recursive-include helpdesk/templates * recursive-include helpdesk/fixtures *.json diff --git a/docs/install.rst b/docs/install.rst index 05c5cac3..130979df 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -55,9 +55,9 @@ Adding To Your Django Project ./manage.py syncdb -4. Inside your ``MEDIA_ROOT`` folder, create a new folder called ``helpdesk`` and copy the contents of ``helpdesk/htdocs`` into it. Alternatively, create a symlink:: +4. [If you're not using django.contrib.staticfiles] Inside your ``STATIC_ROOT`` folder, create a new folder called ``helpdesk`` and copy the contents of ``helpdesk/static`` into it. Alternatively, create a symlink:: - ln -s /path/to/helpdesk/htdocs /path/to/media/helpdesk + ln -s /path/to/helpdesk/static/helpdesk /path/to/static/helpdesk 5. Inside your ``MEDIA_ROOT`` folder, inside the ``helpdesk`` folder, is a folder called ``attachments``. Ensure your web server software can write to this folder - something like this should do the trick:: diff --git a/helpdesk/fixtures/initial_data.json b/helpdesk/fixtures/initial_data.json index f038ba03..a8095206 100644 --- a/helpdesk/fixtures/initial_data.json +++ b/helpdesk/fixtures/initial_data.json @@ -384,4 +384,3 @@ } } ] -] diff --git a/helpdesk/htdocs/attachments/README.txt b/helpdesk/htdocs/attachments/README.txt deleted file mode 100644 index 6cd6b2b5..00000000 --- a/helpdesk/htdocs/attachments/README.txt +++ /dev/null @@ -1 +0,0 @@ -This file must be writable by your web server process. diff --git a/helpdesk/htdocs/buttons/accept.png b/helpdesk/static/helpdesk/buttons/accept.png similarity index 100% rename from helpdesk/htdocs/buttons/accept.png rename to helpdesk/static/helpdesk/buttons/accept.png diff --git a/helpdesk/htdocs/buttons/button_template.psd b/helpdesk/static/helpdesk/buttons/button_template.psd similarity index 100% rename from helpdesk/htdocs/buttons/button_template.psd rename to helpdesk/static/helpdesk/buttons/button_template.psd diff --git a/helpdesk/htdocs/buttons/button_template.txt b/helpdesk/static/helpdesk/buttons/button_template.txt similarity index 100% rename from helpdesk/htdocs/buttons/button_template.txt rename to helpdesk/static/helpdesk/buttons/button_template.txt diff --git a/helpdesk/htdocs/buttons/delete.png b/helpdesk/static/helpdesk/buttons/delete.png similarity index 100% rename from helpdesk/htdocs/buttons/delete.png rename to helpdesk/static/helpdesk/buttons/delete.png diff --git a/helpdesk/htdocs/buttons/edit.png b/helpdesk/static/helpdesk/buttons/edit.png similarity index 100% rename from helpdesk/htdocs/buttons/edit.png rename to helpdesk/static/helpdesk/buttons/edit.png diff --git a/helpdesk/htdocs/buttons/take.png b/helpdesk/static/helpdesk/buttons/take.png similarity index 100% rename from helpdesk/htdocs/buttons/take.png rename to helpdesk/static/helpdesk/buttons/take.png diff --git a/helpdesk/htdocs/filter.js b/helpdesk/static/helpdesk/filter.js similarity index 100% rename from helpdesk/htdocs/filter.js rename to helpdesk/static/helpdesk/filter.js diff --git a/helpdesk/htdocs/helpdesk.css b/helpdesk/static/helpdesk/helpdesk.css similarity index 100% rename from helpdesk/htdocs/helpdesk.css rename to helpdesk/static/helpdesk/helpdesk.css diff --git a/helpdesk/htdocs/hover.js b/helpdesk/static/helpdesk/hover.js similarity index 100% rename from helpdesk/htdocs/hover.js rename to helpdesk/static/helpdesk/hover.js diff --git a/helpdesk/htdocs/jquery-1.5.min.js b/helpdesk/static/helpdesk/jquery-1.5.min.js similarity index 100% rename from helpdesk/htdocs/jquery-1.5.min.js rename to helpdesk/static/helpdesk/jquery-1.5.min.js diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_flat_0_aaaaaa_40x100.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_flat_75_ffffff_40x100.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_flat_75_ffffff_40x100.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_55_fbf9ee_1x400.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_65_ffffff_1x400.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_65_ffffff_1x400.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_75_dadada_1x400.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_75_dadada_1x400.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_75_dadada_1x400.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_75_e6e6e6_1x400.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_glass_95_fef1ec_1x400.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_222222_256x240.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_222222_256x240.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_222222_256x240.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_222222_256x240.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_2e83ff_256x240.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_2e83ff_256x240.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_2e83ff_256x240.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_454545_256x240.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_454545_256x240.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_454545_256x240.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_454545_256x240.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_888888_256x240.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_888888_256x240.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_888888_256x240.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_888888_256x240.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_cd0a0a_256x240.png b/helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/images/ui-icons_cd0a0a_256x240.png rename to helpdesk/static/helpdesk/jquery-smoothness-theme/images/ui-icons_cd0a0a_256x240.png diff --git a/helpdesk/htdocs/jquery-smoothness-theme/jquery-ui-1.8.9.custom.css b/helpdesk/static/helpdesk/jquery-smoothness-theme/jquery-ui-1.8.9.custom.css similarity index 100% rename from helpdesk/htdocs/jquery-smoothness-theme/jquery-ui-1.8.9.custom.css rename to helpdesk/static/helpdesk/jquery-smoothness-theme/jquery-ui-1.8.9.custom.css diff --git a/helpdesk/htdocs/jquery-ui-1.8.9.custom.min.js b/helpdesk/static/helpdesk/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from helpdesk/htdocs/jquery-ui-1.8.9.custom.min.js rename to helpdesk/static/helpdesk/jquery-ui-1.8.9.custom.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/excanvas.min.js b/helpdesk/static/helpdesk/jquery.jqplot/excanvas.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/excanvas.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/excanvas.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/jquery.jqplot.min.css b/helpdesk/static/helpdesk/jquery.jqplot/jquery.jqplot.min.css similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/jquery.jqplot.min.css rename to helpdesk/static/helpdesk/jquery.jqplot/jquery.jqplot.min.css diff --git a/helpdesk/htdocs/jquery.jqplot/jquery.jqplot.min.js b/helpdesk/static/helpdesk/jquery.jqplot/jquery.jqplot.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/jquery.jqplot.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/jquery.jqplot.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.BezierCurveRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.BezierCurveRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.BezierCurveRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.BezierCurveRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.barRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.barRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.barRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.barRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.blockRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.blockRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.blockRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.blockRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.bubbleRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.bubbleRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.bubbleRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.bubbleRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.canvasTextRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.canvasTextRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.canvasTextRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.canvasTextRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.categoryAxisRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.categoryAxisRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.categoryAxisRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.categoryAxisRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.cursor.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.cursor.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.cursor.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.cursor.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.dateAxisRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.dateAxisRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.dateAxisRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.dateAxisRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.donutRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.donutRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.donutRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.donutRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.dragable.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.dragable.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.dragable.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.dragable.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.enhancedLegendRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.enhancedLegendRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.enhancedLegendRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.enhancedLegendRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.funnelRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.funnelRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.funnelRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.funnelRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.highlighter.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.highlighter.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.highlighter.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.highlighter.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.logAxisRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.logAxisRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.logAxisRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.logAxisRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.mekkoAxisRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.mekkoAxisRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.mekkoAxisRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.mekkoAxisRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.mekkoRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.mekkoRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.mekkoRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.mekkoRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.meterGaugeRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.meterGaugeRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.meterGaugeRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.meterGaugeRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.ohlcRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.ohlcRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.ohlcRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.ohlcRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.pieRenderer.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.pieRenderer.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.pieRenderer.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.pieRenderer.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.pointLabels.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.pointLabels.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.pointLabels.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.pointLabels.min.js diff --git a/helpdesk/htdocs/jquery.jqplot/plugins/jqplot.trendline.min.js b/helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.trendline.min.js similarity index 100% rename from helpdesk/htdocs/jquery.jqplot/plugins/jqplot.trendline.min.js rename to helpdesk/static/helpdesk/jquery.jqplot/plugins/jqplot.trendline.min.js diff --git a/helpdesk/htdocs/priorities/priority1.png b/helpdesk/static/helpdesk/priorities/priority1.png similarity index 100% rename from helpdesk/htdocs/priorities/priority1.png rename to helpdesk/static/helpdesk/priorities/priority1.png diff --git a/helpdesk/htdocs/priorities/priority2.png b/helpdesk/static/helpdesk/priorities/priority2.png similarity index 100% rename from helpdesk/htdocs/priorities/priority2.png rename to helpdesk/static/helpdesk/priorities/priority2.png diff --git a/helpdesk/htdocs/priorities/priority3.png b/helpdesk/static/helpdesk/priorities/priority3.png similarity index 100% rename from helpdesk/htdocs/priorities/priority3.png rename to helpdesk/static/helpdesk/priorities/priority3.png diff --git a/helpdesk/htdocs/priorities/priority4.png b/helpdesk/static/helpdesk/priorities/priority4.png similarity index 100% rename from helpdesk/htdocs/priorities/priority4.png rename to helpdesk/static/helpdesk/priorities/priority4.png diff --git a/helpdesk/htdocs/priorities/priority5.png b/helpdesk/static/helpdesk/priorities/priority5.png similarity index 100% rename from helpdesk/htdocs/priorities/priority5.png rename to helpdesk/static/helpdesk/priorities/priority5.png diff --git a/helpdesk/htdocs/priorities/readme.txt b/helpdesk/static/helpdesk/priorities/readme.txt similarity index 100% rename from helpdesk/htdocs/priorities/readme.txt rename to helpdesk/static/helpdesk/priorities/readme.txt diff --git a/helpdesk/htdocs/rss_icon.png b/helpdesk/static/helpdesk/rss_icon.png similarity index 100% rename from helpdesk/htdocs/rss_icon.png rename to helpdesk/static/helpdesk/rss_icon.png diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index 2d8ad96c..ff857843 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -5,10 +5,10 @@ {% block helpdesk_title %}Helpdesk{% endblock %} :: {% trans "Powered by django-helpdesk" %} - - - - + + + + @@ -70,7 +70,7 @@ {% include "helpdesk/debug.html" %} diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html index 60bf695a..4a087073 100644 --- a/helpdesk/templates/helpdesk/dashboard.html +++ b/helpdesk/templates/helpdesk/dashboard.html @@ -1,7 +1,7 @@ {% extends "helpdesk/base.html" %}{% load i18n %} {% block helpdesk_title %}{% trans "Helpdesk Dashboard" %}{% endblock %} {% block helpdesk_head %} - + {% endblock %} {% block helpdesk_body %} diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html index b56df336..b3e77054 100644 --- a/helpdesk/templates/helpdesk/public_base.html +++ b/helpdesk/templates/helpdesk/public_base.html @@ -1,8 +1,8 @@ {% load i18n %} {% block helpdesk_title %}{% trans "Helpdesk" %}{% endblock %} - - + + {% block helpdesk_head %}{% endblock %} diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html index e3e5f41e..f6c5983e 100644 --- a/helpdesk/templates/helpdesk/public_view_ticket.html +++ b/helpdesk/templates/helpdesk/public_view_ticket.html @@ -43,7 +43,7 @@ {% if ticket.resolution %} - {% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% trans "Accept" %}{% endifequal %} + {% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% trans "Accept" %}{% endifequal %} {{ ticket.resolution|urlizetrunc:50|linebreaksbr }} diff --git a/helpdesk/templates/helpdesk/rss_list.html b/helpdesk/templates/helpdesk/rss_list.html index 14bac6b7..1c129850 100644 --- a/helpdesk/templates/helpdesk/rss_list.html +++ b/helpdesk/templates/helpdesk/rss_list.html @@ -6,13 +6,13 @@

{% trans "The following RSS feeds are available for you to monitor using your preferred RSS software. With the exception of the 'Latest Activity' feed, all feeds provide information only on Open and Reopened cases. This ensures your RSS reader isn't full of information about closed or historical tasks." %}

-
{% trans "RSS Icon" %}{% trans "My Open Tickets" %}
+
{% trans "RSS Icon" %}{% trans "My Open Tickets" %}
{% trans "A summary of your open tickets - useful for getting alerted to new tickets opened for you" %}
-
{% trans "RSS Icon" %}{% trans "Latest Activity" %}
+
{% trans "RSS Icon" %}{% trans "Latest Activity" %}
{% trans "A summary of all helpdesk activity - including comments, emails, attachments, and more" %}
-
{% trans "RSS Icon" %}{% trans "Unassigned Tickets" %}
+
{% trans "RSS Icon" %}{% trans "Unassigned Tickets" %}
{% trans "All unassigned tickets - useful for being alerted to new tickets opened by the public via the web or via e-mail" %}
@@ -24,8 +24,8 @@ {% for queue in queues %} {{ queue.title }} - {% trans "RSS Icon" %} - {% trans "RSS Icon" %} + {% trans "RSS Icon" %} + {% trans "RSS Icon" %} {% endfor %} {% endblock %} diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html index 04731ca9..393a70c9 100644 --- a/helpdesk/templates/helpdesk/ticket.html +++ b/helpdesk/templates/helpdesk/ticket.html @@ -51,7 +51,7 @@
{{ followup.title }} {% if followup.user %}by {{ followup.user }}{% endif %} {{ followup.date|timesince }} ago{% if not followup.public %} ({% trans "Private" %}){% endif %} - Edit + Edit
{% if followup.comment %}{{ followup.comment|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}{% endif %} {% for change in followup.ticketchange_set.all %} diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index c5c78472..75227b2a 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -1,6 +1,6 @@ {% load i18n %} - + @@ -49,7 +49,7 @@ {% if ticket.resolution %} - + diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index cfb0fb42..491e242b 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -1,8 +1,8 @@ {% extends "helpdesk/base.html" %}{% load i18n %} {% block helpdesk_title %}{% trans "Ticket Listing" %}{% endblock %} {% block helpdesk_head %} - - + +
{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}] EditDelete{% if ticket.on_hold %}{% trans "Unhold" %}{% else %}{% trans "Hold" %}{% endif %}
{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}] EditDelete{% if ticket.on_hold %}{% trans "Unhold" %}{% else %}{% trans "Hold" %}{% endif %}
{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}
{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% trans "Accept" %}{% endifequal %}{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% trans "Accept" %}{% endifequal %}
{{ ticket.resolution|force_escape|urlizetrunc:50|linebreaksbr }}