From 3030d4b60add07abdd3e23a0dd4999ab6011e837 Mon Sep 17 00:00:00 2001
From: Joey Schulze <joey@infodrom.org>
Date: Wed, 17 Dec 2014 00:16:39 +0100
Subject: [PATCH 1/1] Import plain files from CleanFS

---
 README.md                                   |   19 +
 asc.png                                     |  Bin 0 -> 162 bytes
 button_cancel.png                           |  Bin 0 -> 248 bytes
 calendar.css                                |  251 +++
 comment.png                                 |  Bin 0 -> 353 bytes
 desc.png                                    |  Bin 0 -> 159 bytes
 down.png                                    |  Bin 0 -> 249 bytes
 edit_add.png                                |  Bin 0 -> 152 bytes
 edit_remove.png                             |  Bin 0 -> 117 bytes
 ie.css                                      |   36 +
 img/black/calendar_alt_fill_16x16.png       |  Bin 0 -> 201 bytes
 img/black/comment_stroke_16x14.png          |  Bin 0 -> 254 bytes
 img/black/loop_alt3_12x9.png                |  Bin 0 -> 238 bytes
 img/caret.gif                               |  Bin 0 -> 61 bytes
 img/gray/blocking_13x12.png                 |  Bin 0 -> 367 bytes
 img/gray/calendar_alt_stroke_12x12.png      |  Bin 0 -> 239 bytes
 img/gray/cog_alt_12x12.png                  |  Bin 0 -> 259 bytes
 img/gray/comment_stroke_16x14.png           |  Bin 0 -> 296 bytes
 img/gray/compass_12x12.png                  |  Bin 0 -> 284 bytes
 img/gray/dependent_13x12.png                |  Bin 0 -> 289 bytes
 img/gray/document_alt_stroke_9x12.png       |  Bin 0 -> 204 bytes
 img/gray/folder_stroke_12x12.png            |  Bin 0 -> 209 bytes
 img/gray/list_12x11.png                     |  Bin 0 -> 139 bytes
 img/gray/pin_24x24.png                      |  Bin 0 -> 506 bytes
 img/green/check_24x20.png                   |  Bin 0 -> 293 bytes
 img/red/x_alt_24x24.png                     |  Bin 0 -> 404 bytes
 img/white/calendar_alt_stroke_12x12.png     |  Bin 0 -> 239 bytes
 img/white/cog_alt_12x12.png                 |  Bin 0 -> 215 bytes
 img/white/compass_12x12.png                 |  Bin 0 -> 223 bytes
 img/white/document_alt_stroke_9x12.png      |  Bin 0 -> 184 bytes
 img/white/folder_stroke_12x12.png           |  Bin 0 -> 204 bytes
 img/white/list_12x11.png                    |  Bin 0 -> 133 bytes
 index.html                                  |    7 +
 kaboodleloop.png                            |  Bin 0 -> 238 bytes
 left.png                                    |  Bin 0 -> 208 bytes
 mime/application.png                        |  Bin 0 -> 960 bytes
 mime/application/octet-stream.png           |  Bin 0 -> 848 bytes
 mime/application/pdf.png                    |  Bin 0 -> 857 bytes
 mime/application/x-gzip.png                 |  Bin 0 -> 1078 bytes
 mime/audio.png                              |  Bin 0 -> 979 bytes
 mime/image.png                              |  Bin 0 -> 839 bytes
 mime/text.png                               |  Bin 0 -> 734 bytes
 mime/text/html.png                          |  Bin 0 -> 951 bytes
 mime/video.png                              |  Bin 0 -> 710 bytes
 reset.css                                   |   66 +
 right.png                                   |  Bin 0 -> 221 bytes
 templates/admin.cat.tpl                     |    4 +
 templates/admin.editallusers.tpl            |    7 +
 templates/admin.editgroup.tpl               |    4 +
 templates/admin.groups.tpl                  |   42 +
 templates/admin.menu.tpl                    |   34 +
 templates/admin.newgroup.tpl                |    7 +
 templates/admin.newproject.tpl              |   66 +
 templates/admin.newuser.tpl                 |    7 +
 templates/admin.newuserbulk.tpl             |    7 +
 templates/admin.os.tpl                      |    9 +
 templates/admin.prefs.tpl                   |  302 ++++
 templates/admin.resolution.tpl              |    8 +
 templates/admin.status.tpl                  |    9 +
 templates/admin.tasktype.tpl                |    8 +
 templates/admin.userrequest.tpl             |   49 +
 templates/admin.users.tpl                   |    5 +
 templates/admin.version.tpl                 |    8 +
 templates/common.attachments.tpl            |   44 +
 templates/common.cat.tpl                    |  115 ++
 templates/common.datepicker.tpl             |    9 +
 templates/common.dualselect.tpl             |   25 +
 templates/common.editallusers.tpl           |   89 +
 templates/common.editattachments.tpl        |   46 +
 templates/common.editgroup.tpl              |  213 +++
 templates/common.editlinks.tpl              |   15 +
 templates/common.links.tpl                  |   10 +
 templates/common.list.tpl                   |  125 ++
 templates/common.multiuserselect.tpl        |   51 +
 templates/common.newgroup.tpl               |  161 ++
 templates/common.newuser.tpl                |   85 +
 templates/common.newuserbulk.tpl            |   77 +
 templates/common.profile.tpl                |  151 ++
 templates/common.userselect.tpl             |    6 +
 templates/depends.tpl                       |  107 ++
 templates/details.edit.tpl                  |  347 ++++
 templates/details.tabs.comment.tpl          |  125 ++
 templates/details.tabs.efforttracking.tpl   |   47 +
 templates/details.tabs.history.callback.tpl |   32 +
 templates/details.tabs.history.tpl          |    3 +
 templates/details.tabs.notifs.tpl           |   24 +
 templates/details.tabs.related.tpl          |   57 +
 templates/details.tabs.remind.tpl           |   80 +
 templates/details.tabs.tpl                  |   39 +
 templates/details.view.tpl                  |  832 +++++++++
 templates/editcomment.tpl                   |   73 +
 templates/feed.atom.tpl                     |   32 +
 templates/feed.rss1.tpl                     |   33 +
 templates/feed.rss2.tpl                     |   27 +
 templates/footer.tpl                        |    9 +
 templates/header.tpl                        |  100 ++
 templates/index.tpl                         |  669 +++++++
 templates/links.searches.tpl                |   14 +
 templates/links.tpl                         |  167 ++
 templates/loginbox.tpl                      |   54 +
 templates/lostpw.step1.tpl                  |   13 +
 templates/lostpw.step2.tpl                  |   24 +
 templates/myprofile.tpl                     |    4 +
 templates/newmultitasks.tpl                 |  273 +++
 templates/newtask.tpl                       |  292 +++
 templates/pm.cat.tpl                        |    4 +
 templates/pm.editgroup.tpl                  |    4 +
 templates/pm.groups.tpl                     |   39 +
 templates/pm.menu.tpl                       |   31 +
 templates/pm.newgroup.tpl                   |    7 +
 templates/pm.os.tpl                         |    9 +
 templates/pm.pendingreq.tpl                 |   76 +
 templates/pm.prefs.tpl                      |  239 +++
 templates/pm.resolution.tpl                 |    9 +
 templates/pm.status.tpl                     |    9 +
 templates/pm.tasktype.tpl                   |    9 +
 templates/pm.version.tpl                    |    9 +
 templates/profile.tpl                       |   95 +
 templates/progressbar.tpl                   |    0
 templates/register.magic.tpl                |   30 +
 templates/register.no-magic.tpl             |   56 +
 templates/register.oauth.tpl                |   15 +
 templates/register.ok.tpl                   |    4 +
 templates/reports.tpl                       |  115 ++
 templates/roadmap.text.tpl                  |   49 +
 templates/roadmap.tpl                       |  107 ++
 templates/toplevel.tpl                      |  105 ++
 theme.css                                   | 1779 +++++++++++++++++++
 theme_print.css                             |   29 +
 typography.css                              |  123 ++
 up.png                                      |  Bin 0 -> 268 bytes
 131 files changed, 8606 insertions(+)
 create mode 100644 README.md
 create mode 100644 asc.png
 create mode 100644 button_cancel.png
 create mode 100644 calendar.css
 create mode 100644 comment.png
 create mode 100644 desc.png
 create mode 100644 down.png
 create mode 100644 edit_add.png
 create mode 100644 edit_remove.png
 create mode 100644 ie.css
 create mode 100644 img/black/calendar_alt_fill_16x16.png
 create mode 100644 img/black/comment_stroke_16x14.png
 create mode 100644 img/black/loop_alt3_12x9.png
 create mode 100644 img/caret.gif
 create mode 100644 img/gray/blocking_13x12.png
 create mode 100644 img/gray/calendar_alt_stroke_12x12.png
 create mode 100644 img/gray/cog_alt_12x12.png
 create mode 100644 img/gray/comment_stroke_16x14.png
 create mode 100644 img/gray/compass_12x12.png
 create mode 100644 img/gray/dependent_13x12.png
 create mode 100644 img/gray/document_alt_stroke_9x12.png
 create mode 100644 img/gray/folder_stroke_12x12.png
 create mode 100644 img/gray/list_12x11.png
 create mode 100644 img/gray/pin_24x24.png
 create mode 100644 img/green/check_24x20.png
 create mode 100644 img/red/x_alt_24x24.png
 create mode 100644 img/white/calendar_alt_stroke_12x12.png
 create mode 100644 img/white/cog_alt_12x12.png
 create mode 100644 img/white/compass_12x12.png
 create mode 100644 img/white/document_alt_stroke_9x12.png
 create mode 100644 img/white/folder_stroke_12x12.png
 create mode 100644 img/white/list_12x11.png
 create mode 100644 index.html
 create mode 100644 kaboodleloop.png
 create mode 100644 left.png
 create mode 100644 mime/application.png
 create mode 100644 mime/application/octet-stream.png
 create mode 100644 mime/application/pdf.png
 create mode 100644 mime/application/x-gzip.png
 create mode 100644 mime/audio.png
 create mode 100644 mime/image.png
 create mode 100644 mime/text.png
 create mode 100644 mime/text/html.png
 create mode 100644 mime/video.png
 create mode 100644 reset.css
 create mode 100644 right.png
 create mode 100644 templates/admin.cat.tpl
 create mode 100644 templates/admin.editallusers.tpl
 create mode 100644 templates/admin.editgroup.tpl
 create mode 100644 templates/admin.groups.tpl
 create mode 100644 templates/admin.menu.tpl
 create mode 100644 templates/admin.newgroup.tpl
 create mode 100644 templates/admin.newproject.tpl
 create mode 100644 templates/admin.newuser.tpl
 create mode 100644 templates/admin.newuserbulk.tpl
 create mode 100644 templates/admin.os.tpl
 create mode 100644 templates/admin.prefs.tpl
 create mode 100644 templates/admin.resolution.tpl
 create mode 100644 templates/admin.status.tpl
 create mode 100644 templates/admin.tasktype.tpl
 create mode 100644 templates/admin.userrequest.tpl
 create mode 100644 templates/admin.users.tpl
 create mode 100644 templates/admin.version.tpl
 create mode 100644 templates/common.attachments.tpl
 create mode 100644 templates/common.cat.tpl
 create mode 100644 templates/common.datepicker.tpl
 create mode 100644 templates/common.dualselect.tpl
 create mode 100644 templates/common.editallusers.tpl
 create mode 100644 templates/common.editattachments.tpl
 create mode 100644 templates/common.editgroup.tpl
 create mode 100644 templates/common.editlinks.tpl
 create mode 100644 templates/common.links.tpl
 create mode 100644 templates/common.list.tpl
 create mode 100644 templates/common.multiuserselect.tpl
 create mode 100644 templates/common.newgroup.tpl
 create mode 100644 templates/common.newuser.tpl
 create mode 100644 templates/common.newuserbulk.tpl
 create mode 100644 templates/common.profile.tpl
 create mode 100644 templates/common.userselect.tpl
 create mode 100644 templates/depends.tpl
 create mode 100644 templates/details.edit.tpl
 create mode 100644 templates/details.tabs.comment.tpl
 create mode 100644 templates/details.tabs.efforttracking.tpl
 create mode 100644 templates/details.tabs.history.callback.tpl
 create mode 100644 templates/details.tabs.history.tpl
 create mode 100644 templates/details.tabs.notifs.tpl
 create mode 100644 templates/details.tabs.related.tpl
 create mode 100644 templates/details.tabs.remind.tpl
 create mode 100644 templates/details.tabs.tpl
 create mode 100644 templates/details.view.tpl
 create mode 100644 templates/editcomment.tpl
 create mode 100644 templates/feed.atom.tpl
 create mode 100644 templates/feed.rss1.tpl
 create mode 100644 templates/feed.rss2.tpl
 create mode 100644 templates/footer.tpl
 create mode 100644 templates/header.tpl
 create mode 100644 templates/index.tpl
 create mode 100644 templates/links.searches.tpl
 create mode 100644 templates/links.tpl
 create mode 100644 templates/loginbox.tpl
 create mode 100644 templates/lostpw.step1.tpl
 create mode 100644 templates/lostpw.step2.tpl
 create mode 100644 templates/myprofile.tpl
 create mode 100644 templates/newmultitasks.tpl
 create mode 100644 templates/newtask.tpl
 create mode 100644 templates/pm.cat.tpl
 create mode 100644 templates/pm.editgroup.tpl
 create mode 100644 templates/pm.groups.tpl
 create mode 100644 templates/pm.menu.tpl
 create mode 100644 templates/pm.newgroup.tpl
 create mode 100644 templates/pm.os.tpl
 create mode 100644 templates/pm.pendingreq.tpl
 create mode 100644 templates/pm.prefs.tpl
 create mode 100644 templates/pm.resolution.tpl
 create mode 100644 templates/pm.status.tpl
 create mode 100644 templates/pm.tasktype.tpl
 create mode 100644 templates/pm.version.tpl
 create mode 100644 templates/profile.tpl
 create mode 100644 templates/progressbar.tpl
 create mode 100644 templates/register.magic.tpl
 create mode 100644 templates/register.no-magic.tpl
 create mode 100644 templates/register.oauth.tpl
 create mode 100644 templates/register.ok.tpl
 create mode 100644 templates/reports.tpl
 create mode 100644 templates/roadmap.text.tpl
 create mode 100644 templates/roadmap.tpl
 create mode 100644 templates/toplevel.tpl
 create mode 100644 theme.css
 create mode 100644 theme_print.css
 create mode 100644 typography.css
 create mode 100644 up.png

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..95dbc2f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,19 @@
+CleanFS
+=======
+
+A proposal for a new [Flyspray](http://flyspray.org/) theme.
+
+You can find more info, and discussion on flyspray's [mailing group](http://groups.google.com/group/flyspray/browse_frm/thread/6bcfdfb6d17f92bf)
+
+Usage
+-----
+
+- In Flyspray 0.9.9.6:
+  - put files in your `/flyspray/themes/` directory
+  - overwrite your `/flyspray/templates/` with the new ones (you might want to backup them first)
+
+Credits
+-------
+
+- [Blueprint CSS](http://blueprintcss.org) - used for reseting CSS and base typography
+- [Iconic](http://somerandomdude.com/work/iconic/) - used for interface icons
diff --git a/asc.png b/asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b798bdeacf7e5da79ecf0d41d96745410a95d9f
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XTs&PILn>}1B{(qDDcs{f@_b>A$N~PTKlqPobX`z26iJ-i
zqMgJfB)&i`)?t&7vyNQH+leK&oR0=D>|!!VNK#;6VB%rmcqhFv@@~c*pm_|Qu6{1-
HoD!M<C9pAe

literal 0
HcmV?d00001

diff --git a/button_cancel.png b/button_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..297f23c825af790f09433d2f3d0b5b13ba62fcf4
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GvpiiKLn>}1r8qF{+xPEz;}k|_tsNUGKf5_gv<t3SA$LlQ
z;Sm$tn+1%=5*(jBVAPP3X|Q1Ik}b%vU^v3<FoW~OzGjDG%qxyCuUN*Ok+VU@Lsxi~
zCs)90(F-?tPWUx3ugLB3aO$~m;qW>}4MqO1r<qm=7)kSJ6bqS53Yf#PWvcxAHeLr-
u_6tXtHe}9Vm|Ac^P+WXLmIMP655tqYT0u|a(rkgQWbkzLb6Mw<&;$Tw`BYc{

literal 0
HcmV?d00001

diff --git a/calendar.css b/calendar.css
new file mode 100644
index 0000000..b224885
--- /dev/null
+++ b/calendar.css
@@ -0,0 +1,251 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: ButtonFace;
+}
+
+.calendar .nav {
+  background: ButtonFace url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: ActiveCaption;
+  color: CaptionText;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid ButtonShadow;
+  padding: 2px;
+  text-align: center;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border: 2px solid;
+  padding: 0px;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  border-width: 1px;
+  padding: 2px 0px 0px 2px;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid ButtonShadow;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody .rowhilite td {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  padding: 2px 2px 0px 2px;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody td.disabled { color: GrayText; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: ButtonFace;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  color: ButtonText;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4e0d8;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: Menu;
+  color: MenuText;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  padding: 0px;
+  border: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time {
+  border-top: 1px solid ButtonShadow;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: ButtonFace;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: Menu;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/comment.png b/comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..71d12003df7ddf4dd633c2e8f142b1b95c419460
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz14%?dRCwBqQ$Y@bKnz@v1aIIE{DB<3
z$<Z4g{e@3}C-?-P;1lGgH-CUXa6OWUIyHsVb$3IP$u@M`olc8Vuqcj8;10YUpx91X
zY(mL6D`2YJMzM7mMf%ls7a0hsI?fb0aUq-Sfeg^kww?V%1kIJ}d5Vd9iHwD6oLz;V
znFTca6~C02*`WP!RSvm7vYd6$f^Gv81d)^SRLbuZplS_udurw+NZc*3Wd8=7`CCqT
zflV-xTp2xYSdRlU);7h5sWAPa73)-7;y}2%-xc3@#*R@kT!@9!k>_F|ws7v*(7(h+
z^zHk(N^5`o^3mABN+^EyE!I#(FerR?KLQK@*H~G|(gSKI00000NkvXXu0mjf=Gc~V

literal 0
HcmV?d00001

diff --git a/desc.png b/desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c7b58bc6e5979c4776d15552e5eeef9d6ad438f
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X96eneLn>}1B{(otEBxa>`pv*mjg5(6nSxxmOiYg5l^dTu
z!VcU}uoU4e;hB{D;P}E9HX(hCvz0_VOI$T3F)*?*+*~DdSF~KV6lfTOr>mdKI;Vst
E0C0RTC;$Ke

literal 0
HcmV?d00001

diff --git a/down.png b/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..294b222ad1dafb0121cf9c51ec7257b0ab30ef06
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XW_!9ghE&{obNMW9g91;(#bc~8je-)56J=H^KUC{mFd>0S
zL)ZT45|zCgfA4WJ{F5+GPvqIY=fIQC%<`;P9Q+FzcHO-DqHhP^?ucCt7n!Y;mONYd
zazk;wyVg8qnF+_`IfNMZ?-2aI-O0vLr!cXkM*5m(2XF3-MwP<MC#HI>6Fvqm(Yn`d
wax{A4x(Zz*k>>&vD>wyvpL+!V5lUc?)4cw1*`$>wKxZ;|y85}Sb4q9e0GDcA!T<mO

literal 0
HcmV?d00001

diff --git a/edit_add.png b/edit_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..47f4a8cb7538e201072a9f86fbc6ba0a4d0a3d2c
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XtUO&DLn>}1r5s?a`OEZA`LlWctpgptvck-*30D}{*xbHc
xkZVjlz;uMq;tAh^j~iDd%lMv}BF!L>z##vT+v|$f_6(pY44$rjF6*2UngG>lFv9=<

literal 0
HcmV?d00001

diff --git a/edit_remove.png b/edit_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb4f5f3e889e7068eb085ea64715528e871a71c4
GIT binary patch
literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~d!2~2Zu4(KBQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jio`u#978H@C4KqIouI&KU^syzV?Cq70fw#589vWxUeOIy
O!r<xZ=d#Wzp$PzUa3OvG

literal 0
HcmV?d00001

diff --git a/ie.css b/ie.css
new file mode 100644
index 0000000..f015399
--- /dev/null
+++ b/ie.css
@@ -0,0 +1,36 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 1.0.1
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
+textarea {overflow:auto;}
+label {vertical-align:middle;position:relative;top:-0.25em;}
+input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+button, input.button {position:relative;top:0.25em;}
\ No newline at end of file
diff --git a/img/black/calendar_alt_fill_16x16.png b/img/black/calendar_alt_fill_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39c383f3ef26bfbb7637645d5d5dc1a1f72b69f
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XvOQfKLn>}1B^+RRzi>uGA<qZ-u1=wJN8ywsi#X?7++av~
zz<)%3!i|<AfpgdnJ#UPV?>aB6_;0>odwnNc^LYk#joJneyEeuii$(n6^#U!7!czAc
wPtM=*L;QoPO3X{SWApo$)d{GmG%zqT?4Dy*6qhO$0JN6D)78&qol`;+0JvpDMgRZ+

literal 0
HcmV?d00001

diff --git a/img/black/comment_stroke_16x14.png b/img/black/comment_stroke_16x14.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4ee36b8714fbf58b4f884489dc1d6db4efc1a78
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3HGN^yhQ|DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MGHJ#978H@B_%X4)G4fEfArnqk32uy$@A<<m24&j^BUZ8
z*j_f9Y;wpoYmnN)*r9IlfQ`=~hT#a4Lk+_+{%3E#@*H8TRk2lge_(Fvc?X*n?w`2s
zFa$N&`p642w>HEu%Pjc9UbLsdSl}aL-HQDag>P3!G&M;+;6M7^)6;{;L#pFy$D}Ee
z3%BJt6uo0r$ZKE~5VGhv-+#jIySl0s0}~I>7a=^(B}+npZe{Rv^>bP0l+XkKz9?33

literal 0
HcmV?d00001

diff --git a/img/black/loop_alt3_12x9.png b/img/black/loop_alt3_12x9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0fe7ce3db742d902edf4275569612683643e8cf
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CJ!3HGRcAO0XQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JiY9ovIEGZ*N=iGx9C733>zNS|Jpcawtrk){#v$^A{SvFi
z7Ym1vYzlrqK7W4hKB4WiLmwk^q5#8{4T4J^+D|BE=#bu^;ni@9A*e?1ou9(C_Dw$%
zb2RSDy-JbTEqAl|mqU%btAL_9|B>I0>k?bIemL8@al|xaK4{Nk*!i7NM7fz?;i!WR
kqw<}`9rE)<85r3Zj=fQJcU1^I33MBSr>mdKI;Vst08DdLr2qf`

literal 0
HcmV?d00001

diff --git a/img/caret.gif b/img/caret.gif
new file mode 100644
index 0000000000000000000000000000000000000000..095256951508636168121279330817b4cfacc8fd
GIT binary patch
literal 61
zcmZ?wbhEHb<YeGxXkcUjg8%>jEB<5wG8q|kKzxu41CvOL;L7${Z|-$6T3uVRv$%9_
KXnYU@gEauVuMn32

literal 0
HcmV?d00001

diff --git a/img/gray/blocking_13x12.png b/img/gray/blocking_13x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..d09d45f5fe7690904d64f539a6350f2e2aee6082
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp@K+MCz1|)ZGH@^v_7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f>I@}5hcO-X(i=}MX3w{iJ5sNdVa1U3T4K6
zrh0}3249L60#)7fba4#P2u}X-|Gzym&-%FC_t-khnLgHQ{9|~^&Xg%O!zzV0HlVe<
zVGEZB<AiCfkCp~}-0Tp=p~82K<;fC-nRbjf%U0B|h1BVvaGSuEx#EDGLM&72@&%T&
zSvBfdw8Z%?iSRvb$Yt21?(nlOLn`r=S%b*IKa&`*vKWaz>5+F>(<b847jQUEAzRBa
zNP#8f14q}vdF-14O%ASgE$)-LVz%LV;|=jF;Tx438W@iD3e9qx@lv6F+W}@K-4l+>
ziXLz<OjtNU!Tl4vj)TKQ4Ng-Z*%Qa)c6vzpHgs{QDKkhJuL}4Zv*I<-rwpF1elF{r
G5}E+Z{(m_D

literal 0
HcmV?d00001

diff --git a/img/gray/calendar_alt_stroke_12x12.png b/img/gray/calendar_alt_stroke_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..627d066c783923c0cff22dbc7c4a3961e182954f
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G6FprVLn>}1B{(pxzP9E+|B<gAf2t-(Y?2aN(Zrmn*vKyV
zfnkAFwZhW_EGkkCJZy&;mMm*zjbzE-R+ic?=wZ6Zg7f65iWQ4mZ`_cOYEWSG(m!(0
zu3-^l#w_JY&zMRIBVHty3QaI-;EHeQs&81C>{J}YB({z5jHSigmScJ?yBJ)XnSB}@
jY!plcBrACs7}*$<S!{0?N=a7&9mnA5>gTe~DWM4f%XLku

literal 0
HcmV?d00001

diff --git a/img/gray/cog_alt_12x12.png b/img/gray/cog_alt_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff9d09d35dc175239aab3569e09865c8b7e0674f
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GOFdm2Ln>}1r8qFJzP@fcdl3JEnAQsq4z!>6)Dz(P%OQ(V
zM4F+HDMaqbeuk&&45slZj*}QP=QN}xG6_j9IW~c_)0v~;s)6I(oCY1nEwcn$F7g;L
ztW0GQ`aiL^QOkvoMWj;AB-?(0<}>$lagS!ENmrR1Tt82IqQ2m#Bcs@wpAk+RvLXy~
zttWDNe|X5md7{pv!7YF>>V!^1*FmNJ#)(&!FbX6voUb;!xy*{I1L$A|Pgg&ebxsLQ
E0JXqa>Hq)$

literal 0
HcmV?d00001

diff --git a/img/gray/comment_stroke_16x14.png b/img/gray/comment_stroke_16x14.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c603a8a52ac9d236969f214b200b3528779ba3d
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3HGN^yhQ|DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MW;Mn978H@C8aPlg=Sy-%)F9GLoDF{uN}ijHibM6Zq6DG
zp@bHx0yz&!0|9;qHcJNHohLZ1#PAylYB3tsGRgJwd8}iROgg|M%8<=AOTy#8vt|cw
z$7wPRQkM?2JbBJ}WQXjN9F?t%J|05so*d200Z|Q|jZO~h82L8bP`JsEpzunW-G+PO
ztRD+sve-&VM@$g;seH7JX(H!K#S`586HM|H7Dz5BWISPd;YCV=s!B?)_yWz(%u#=m
rd(+%ho*$kg#}Kk-;tdB@4g-d5miF;q&!uSqeZ}DE>gTe~DWM4f?0;YJ

literal 0
HcmV?d00001

diff --git a/img/gray/compass_12x12.png b/img/gray/compass_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b9d22658086650c9a300bb2bab263b1fbe9f31b
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G`#fD7Ln>}1r8G2M&Axt`c_o_yA43x3iVy4x_ZWoudHHHM
zgc4e`uCWKPFW_?Q(sMACQ0TN|FpW)VnN`E6#b~s0A|ofm)7J~lnoT4P94&W<{BHJf
z3p>nG`k6iDs6upOh5ePk!V8KNq?u+cu+mr1ZmTL_IuY;i&25Fqjhj9^GZGk2Xa=-$
zzL=zAaDKr~$s_w1xV@GL{64@`n$8s9Xdhz0a8mMwB5TnvCbcCB+789W+Y)jWY#({}
dN-;39F?hUA61|vy_#x0I44$rjF6*2UngApYU7r8|

literal 0
HcmV?d00001

diff --git a/img/gray/dependent_13x12.png b/img/gray/dependent_13x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..9299fd937e91ebc685a588d12be2f499afd59f95
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp@K+MCz1|)ZGH@^v_7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f>I@}5hcO-X(i=}MX3w{iJ5sNdVa1U3T4K6
zrh0}3249L60#!}$ba4#P2u}X-|Gzym&-%FC_t-khnLgHQ{9|~^&Xg%O!zzV0)}t$N
z)`XXv9V!(kxNT5VP-pc$9H?-grCYJu(X7eDW3gwPQ<0vT^kK(YhYBsU1>1kHO;C%e
zb1XMHb4@%Y`_NOH7_-K??Q#MJ=|>oz$|Zgbx7en@ese*ONYe>3rzRQCNn1|1UgGEq
dXgbNkuzbtj;t8`Irvcr@;OXk;vd$@?2>|t4VA22p

literal 0
HcmV?d00001

diff --git a/img/gray/document_alt_stroke_9x12.png b/img/gray/document_alt_stroke_9x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..efe2dabe23416c936b96e55a15591e58961d81bc
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRO!3HEZ#7tidq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c73F!lIEGZ*N{ZQA_P3tR=L2JhtWz_yev^eyz(ID08ip>%
z97X}@j0U?+i&!0E`xJPRoR2=>nkn&td4rRfj*!7>M+e3hLlMTcF&s-AW-w-i+D^z)
zNRegUbok{Gj%Nkz3zRpWv|gam#F@a%z{tiR_d!mAbL(pXpv?@Pu6{1-oD!M<KFK~c

literal 0
HcmV?d00001

diff --git a/img/gray/folder_stroke_12x12.png b/img/gray/folder_stroke_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..b243180f6d28a6b5505b9813125e80db2aeb4bfb
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G#hxyXAr-fhV)mB(t!L9wFtL~*INO4IN*%*dg#`?U9GYK!
z%#2_#*(i9VK`W;rX^zx{gG>r`4X!qfEs0Vx4Qj>$3|uG7EF26S4>UdLVP(0p$l@jA
zh0E+8SF%}2zF|^h6Jk6m<-w`SKBJ9WrR5T90|PU|^)R{nj$h*YfYvj3y85}Sb4q9e
E0RCV>=>Px#

literal 0
HcmV?d00001

diff --git a/img/gray/list_12x11.png b/img/gray/list_12x11.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bd122d31ef7c5ade9ff58f5a599fde4e2138399
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3HF~3v%Ltlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlB3(}x$B>F!Ns)WY{?@axwY6P%aKKGNT0enNlkE|6Kpivl
kR>spSCbP9pW?<rB5DiqfeB88}7pRfJ)78&qol`;+0GQq<aR2}S

literal 0
HcmV?d00001

diff --git a/img/gray/pin_24x24.png b/img/gray/pin_24x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..d690ce78b630cb6e525712c47e4275ba6fac367e
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzoJmAMRCwB~R?%&PFc8Iv|FS{Zplncg
z1EQ+mWrU2t2y}wd@2X0=fwKYKfNTI8^c+1$m(v+inv*P(v;FS;?w%EsthCRs-91eW
zjfzGN_ef*!{V&g(qj#8<;14u81}x17vJ~XUtN_lDWxlZ82Pv}!z&o0@prMRx^TAqt
zhrJ0BXv_@wD-O<Ox+fYo;@pk}8Pf>(J5AjcG_(u8JdI>t3%5g7g~Ic!r3&Y*0H}zD
zCmP?%jT!}W%g<-ZA_u7f%v+ON1<qR}(=h%|HIf1NqEo=NnpEN(zkMSEl#yaxQ*cda
z$4rQbThILEAH`mVry@=MXFYCaxif%Y1n}>MMi=~j1l-dwDebGbsQ}{bR*MdD3_KCK
zadQDW_H7}$(=EIfKt~Q;OiY+oyiI2_iqHl{3m-G@RVTWqU^i0(^a`gAKm&dkpv6i}
z1nmUN6zOXPvkI8BT7qBPfU<uS1sd7Az9cFY{9I&E(+L$97~4pjI;<5ja86O6W<WLv
ww&x9Fl^I4&i+=-Cazo3Iy%kyC%zgzJ0L<8-ZNL(h6aWAK07*qoM6N<$g2DaO#{d8T

literal 0
HcmV?d00001

diff --git a/img/green/check_24x20.png b/img/green/check_24x20.png
new file mode 100644
index 0000000000000000000000000000000000000000..55d48208933f4b5043dafea8d0bceb44745f52bd
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1>!3HF|Hk`EvQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JijI4_IEGZ*N=jKElwtj71^*I0hC;`wXaBVt6uN0i>oJIW
zHAEirU_LB4K{s*9#D@jmGcqzPID8ToEqo~7aHCPsH`zu*v_Yle;rEF_ha1ykQe2E{
z7^hS-&Q@I_#pmyu(Po^mxkcviL9qu0GDn3J!W51d2qZ8bHIegW3uqQSVJO2gV}afu
zhXX>Jc-;G#lMYQ!IULx<Wu&8+Vc{0((xmDl*|&9r@*$x`yvHMFJ=)l!a`>az^#~os
pn*~i@87HaoJdxmIVqj!r=$KXZWa8}UVn8o3c)I$ztaD0e0s!XAW=sG8

literal 0
HcmV?d00001

diff --git a/img/red/x_alt_24x24.png b/img/red/x_alt_24x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecd2fc3cc5ec808f54deb7949a62874d0a4976a4
GIT binary patch
literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzHc3Q5RCwCFR_zUfKn(3&{O<-vH(&$V
zKt_OxWCLyl+yFOV0|*;90k&8O!u4_p(&R#7%X|HJ<y7FX_5?S4M0i3x=ZU+<Q{c%}
z0}ly93BXr;7z?OmL>42_bL!9*@H=Pb3l1Dx@Vjya7?4pWu+9utlFTY#_O;+-@wgH-
z>Uja%T1YeLD=<P(>G1XMl@1>qSc+!>oU(Xf3|QLN^%{Lgu0EI!p0G9R+?qXscYXW}
z&DaLXF;W$gLYB%Q$uC8)%E0oQB#xR0+9k4EDr@a2yX+TmUxHPpmu}{;K=Z+i1hp?X
zwPoBc50Y9tHrNPii5HL*M34*4fS1TN(1C<w0s$lMzeSZ}n@fjU41)*O9cbXP&&Q5$
yqI5&>w7=c<yKqK|NLOZ_?0V^|fB$WH3ormd-in!JxX*Y10000<MNUMnLSTYh3#tzQ

literal 0
HcmV?d00001

diff --git a/img/white/calendar_alt_stroke_12x12.png b/img/white/calendar_alt_stroke_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..b287d0439223417cfb6a7471a23a41f401068b88
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G6FprVLn?0d1UB+EDDd3w`G11_k?N-=@de92aL#+6Uf1Bf
zd?rVha73n+27`hCU&O|3ffMG<;*}FjuVDNcrL}8OW)I6gLEB_qQ7hKTUtLmnxeB>|
z%PF$_m!TlBZry>}Z>bU4k36>gJ-TV)3XN&v*REd<SDon7wpzPy5A)kQqCXCB=J8tn
lyl}~$p-tYe)3<?<q5M-QPh!^bGeE~Nc)I$ztaD0e0s!uuSnU7+

literal 0
HcmV?d00001

diff --git a/img/white/cog_alt_12x12.png b/img/white/cog_alt_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..794fbcff4fd41be8330bbdf7f4f52c56cf443b44
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gm7Xq+Ar-gg1RdmUP~g$gdBD-bFxyZl?}$cUKy>h<n==-~
zT;eYezs0P?p5|Ahd{MgPL{RK1FH-{(>tMab3qQ-mZoOz@eYP-j(b>oe9BkKDtT1~K
zd*fJ(h2HO0!S=^y`%iRyoX8_llawj&)!D05^V-(--=9tW7}*$R7a7gXsQly!bOeK^
LtDnm{r-UW|q1H{x

literal 0
HcmV?d00001

diff --git a/img/white/compass_12x12.png b/img/white/compass_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..19b4fd3076aa6cc5eb2e45e206f46741fc1c5ac8
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gjh-%!Ar-f#1V!^QDDupn?CHQY$?p(|oUlQ<yfs_w$AXhi
zLAUa3To{al*FU=Y#+`Zjp#r6e8`g^+jd}EBW1*+R^Ak&&rdb!dEl<>9O6PWJ-Jsn3
zyF@{|+j8y?^MuqDQ&wpomf>94=F6LWZsM_p`F{8Bgjnvs_PE{puT(z+Gecos#*R(T
S&tC;PhQZU-&t;ucLK6V9WK-Gz

literal 0
HcmV?d00001

diff --git a/img/white/document_alt_stroke_9x12.png b/img/white/document_alt_stroke_9x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..faf86fc47097b25538e691dd80434857e3bddf77
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRO!3HEZ#7tidq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6-9ZvIEGZ*O8U_+yN5lgmQ5pprIX<$djJm;SHK^}4p|9F
zNqr-S(rbrH8gIN%GctU@&g4+jz}n4n;uf<;*y8ARo`f*rO?*5r)^I$tX7`wp#K8VU
f;5at}6A#0_i(zKnEEO_9TNpfD{an^LB{Ts5SuQsN

literal 0
HcmV?d00001

diff --git a/img/white/folder_stroke_12x12.png b/img/white/folder_stroke_12x12.png
new file mode 100644
index 0000000000000000000000000000000000000000..5771e57ae43f321bf06b61072d38e82237497558
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gd7dtgAr-fh{_wN#L@+1|BnYQBUgBRM!6M=yk>O`+#>?|x
zae-WC{C|1=go8=Pm=x?9Tx}Rz5~XAcDp(~o8vcHp&oT9e&0dDCkBlPfwhV2L9BWoJ
y@)a^%^x;uqnq)db$cxWl``rKjHWvH>2@DQrig&GYV)+QPnZeW5&t;ucLK6UgSw2Jn

literal 0
HcmV?d00001

diff --git a/img/white/list_12x11.png b/img/white/list_12x11.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c1fee513c43e8b112c1d0636ab4c1990c7b9c3
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3HF~3v%Ltlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlB6Uv}$B>F!Nk8}*zw$VIn9p&5DdalC5q1fM1&xib60UeQ
eAM#{iWMgnQ+mg6Xv~Dp_3xlVtpUXO@geCyREhhs2

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
new file mode 100644
index 0000000..080fe88
--- /dev/null
+++ b/index.html
@@ -0,0 +1,7 @@
+<html>
+<head>
+<META HTTP-EQUIV="refresh" CONTENT="2; URL=../../index.php">
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/kaboodleloop.png b/kaboodleloop.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0fe7ce3db742d902edf4275569612683643e8cf
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CJ!3HGRcAO0XQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JiY9ovIEGZ*N=iGx9C733>zNS|Jpcawtrk){#v$^A{SvFi
z7Ym1vYzlrqK7W4hKB4WiLmwk^q5#8{4T4J^+D|BE=#bu^;ni@9A*e?1ou9(C_Dw$%
zb2RSDy-JbTEqAl|mqU%btAL_9|B>I0>k?bIemL8@al|xaK4{Nk*!i7NM7fz?;i!WR
kqw<}`9rE)<85r3Zj=fQJcU1^I33MBSr>mdKI;Vst08DdLr2qf`

literal 0
HcmV?d00001

diff --git a/left.png b/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbbf1e2144cb0d9d0a569b5553d34def768f70e0
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&aw@={M1#}JR>Pp2K^ZBP(kahKk};&tKDn~tzI4%Qo6J~zt?H3fc4Dw$k+
zPiLot*p79K5se)V>USnB7P@D$ge6}ns9Aagvm>Yce*X7HKbU-`&Xl|%qP{;{^Nzsb
zwZ|PliF!KUS-0}E_P>0Oirj}gLY8^IwEwkDCMo;D)?lB!jX(!5c)I$ztaD0e0s!pP
BNh1IN

literal 0
HcmV?d00001

diff --git a/mime/application.png b/mime/application.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1366b1f05932b5521d8bd1689aaab025999677a
GIT binary patch
literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Qb|NXRCwBA
zj0_Dv@9XQS^Z!4?|9}7fF)%SPF)%VR0x^tcU|@uafglqj12;D()75J?zO{Gu6#xVf
zi?gGZ{+F+x8E@ad&%nXK&hQ^-5)8mtj9?B(GXn$25-v_o26Iz=UU^yRRDb|t0owHc
z@X^zZ&z`?wU}a-w`1ki813S<lux*SG8$s~j|9=dB|Ndq8^ZPHuuU|hIRFxGNSlQWF
z0RnJ1$2b5$KomrO5RF!}-2ZG_2#bwEEd3<&+~Zkm&{{<)`5%Z#nL)!1W(N0;F(*U>
zYY9?{I`fZst^i_TWnpFb`0*pd(`Qc^YHMp4<mKfV@^W(-&YnHX@ENH28&DI_Y6fJ$
z#mNq|lo{+ffB<4*VP$3b@Zmj!udgrI)*U-{GW-TQ{pH)Y3_n5P0n!Yzje~=M0jL%P
zU;)j*_@4nFfS8zBSb)L*pFvPih~f9|-wf^T?F`2b9byobm1XGa?q&!G31MIdX#^Pp
z3_J!VW^lNG3;~5QKmakZ0G+}CG=1*exeRZCPF}TU4TFl25yPAJ?-_RQ-p!DmmBlb|
z;zR~6E-sMO3=Hh-U_-zL00BS%F);%<Y(UA^uU;}F#>X?fe*K!EvZx3gg}ed+;As8$
z^((`Fm@C-X7#NvZfd(*x4FCur7GNkc{QB{W!PM1_!Og}RZ1Ss@FB$m6#29pqjTyRU
z&t}+r<Ost*kj<cg0~*N4#>&6~W-~AV1P}`|6AJ?qJ1fJFw;vdyqM{fcJ$l5@4Gf2`
zK>s$)n#J%36bnF?fWe<XkU#~xh6NaQpcDoWKrBE%Ffaj~cKO6fh9F?{F#~P-05n+;
z=mI8SNP`m3XJ8um4NMDQ1AzGVuixP04T>ay0AgWgVP=q%kYo^5Q)PJn?i~X+A0LCc
zrUnBS&`@TeqCbEBGJN^|mEi->fM38s{`KV>gNmpKFhV$iiS920Kmf6@vvV`FH8(L7
z<h@~Ffrcz2BT^oK15k1XCOu%3^YZclGsSOEN@WBHAeP&A?=W!l@`BSlSO+LuLbDPq
zV<F`)F!%&acrRbQVEF#y2P;4TG0MtF&j8w}4OIM_0h)n8CP4K30~_)mnl(WzP@-dm
iIFaq`yZ1W)0t^7@$SM_j*4?N80000<MNUMnLSTZ(LYfZ%

literal 0
HcmV?d00001

diff --git a/mime/application/octet-stream.png b/mime/application/octet-stream.png
new file mode 100644
index 0000000000000000000000000000000000000000..257b205f5fddc74911aadf5811b368965961072d
GIT binary patch
literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!;z>k7RCwBA
z`2YVu13F+~VF6M8Dk>@uEiEm-GBGhtVrFLM5)cqzke8Qdkdl&O5EmC`0E#gH1P}uj
z1B8GY7CSjP{W);p!2f&q?)@(;Ec_4Dbc>6N%S%Q^2E_n?075q)5-9P!yuAGXl`B{N
zKY#xG|C1+A{y%*9@c*)9%l`ZO`~L#EV7V9&h=_=Q4FCurMvwuFjEs^%JRRs<-^9d3
zCKD4AhQELRGJOC39ZUn|z=~hIc)@Vu#0iG8XV1R4bLURkvuDp10|XG*v#hMFhl7HG
zl*7Wp82I@37#=)$0M-n{KY#vY`1kK00~;F~gSxspgRro$1Scow{CDr(@c{%7*Z@I6
zK}8M@4hEpJ89)K`_3KwK{`Kn@O27gwVgTCAaP{g{hChG)FmrQrdjkXz*Z`pBf3IG>
zVtV}eG1vt>JUp<N06QPV2Dt#_vKu#UfDKYpQv*r=2ME9s8QTB=fFO*`-HHFd;s_Tn
z5Sb~Y38AVA-HqMF%)n}}V!$uIjih8G;d|dY11ErBE?@vg5!}YlpFcBv{P+>f2GRHL
z-v_fnX+T<9ngJA*FjoNt5ZC~qW=4?TL5e_vAOH&WFJHcZoeg3uC@8?=UrtUA9I!z3
zOaK7{HUJnPzkwQ=LC%7u3ve6*4FrZbIAB3GOG-+DHG^o7mw<u%3m|~N2Hd@Sw+%>D
zo0*xhgA{`_15+c|H6X>H@Buj+<OPs-j~qF|08FKifZm%A5J2FB1PVl;CM%%gX+}my
zdO*dDpeX$C;R854Ku!m_02Ii_jvf02Oh_AnUMK}x`Vb(1zy^Q<5ELjtKeGUnXoIGv
zW-bu(!Mp*AR$!h0X}<UL>C+aV#`&=H0T4iN13*y*iY|~BzJ2?q0km-@&^0#v{QOMk
z&!7K(>C&YYKvz`*^*l$;JOBX%4m41l^YZe7T_Gwe3ic;3l`#S1ya4E;9YA$a3^)Kl
afB^tZmo65pbgiZU0000<MNUMnLSTZVpkN39

literal 0
HcmV?d00001

diff --git a/mime/application/pdf.png b/mime/application/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4863cb6c4ae23759e205756fc6b7bc22baee820
GIT binary patch
literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!>q$gGRCwBA
ztg5Oy?cw2J%)r3#9|#!G0V9}Tg!7r0m>AgD*ccBSIPkrtrKJEMfEae{*zw~(F7WT)
z|Gyv#i2nlFzkdDt|MTZhu+-(tm;cMl%O3&=AeMhX05bW{pFa#BCdd^a8YK9ifr)|X
z@OFkj&mJ=T@r+<#;^bub{qrXSFE1}xJxDD;0I@*z!!?5eh-T+tV0`zAfq6<3!{^s8
z8UEP$F!1p5F)#uR0C@wd{y#tfVKo5kg1>(m{xh>MumJHN6&(g9AyJ0EzkVWI2vrXd
zKuoZ}0dY|9@81jzy!;G*BxM=?=$JAvbMr9#134S27G?lI0I~c9+61$e0a=oRli}a<
zhYUY2Uu9tW#{x9)7f>@u?k@vK56ray0mKAjAWQ{fpdT5Sm>GVqU%~K9U6<kShYt+D
zu3rKg%Ej;>$;%)B5I{^YC&Odl572ZjE{4CC&M>^cc!7blqK$z|&xqmQ*0l_OIJp`A
zaq%+z2d0bvQ1t)-!~)X@b_X*v*cQg0zZm|`?P2&YCCR}3={>_&Hcke%&GQ*p_<(Xc
zh7AApEg1eXGJ#_YAb?oFP69;>8#@Ez>*oyr9^YqR-o1|D3((n&+U5+OZ(L>gV`Rm^
z%FV&Rym$)3$3rp<zuV_9FtD<MEd~f6mVZE#7(ahxU|cni;mg-A48QJNXZXd;#=zD#
zhe1$Kkb&VBFz|rk@!!ad;iG{i!?)jm82H4c82-P!1Ww`r0mK6K&-ZT(KdxP3`0?)#
z!yiLy1`Zd01}<P~`}^r5!#`NG0wIgC1_STkKMah(=!B(2fB<4){s;7pm?Q&N(-a2w
zZ{HZ0fN{?RjETQLe=z(5CSBx228u$Eft<iV<^;+yGBPp&1Q5%)^XI>tTUv7b`3nuq
zj~^ka5E`}UX#|9S0TUT8GckPr{P`C^05NiNb0<nkNu>ehSwR^OB`brxhnB@bVnEFD
j`t|Ft@87?l1Q1{V(ks~WOR5=@00000NkvXXu0mjf+#`dP

literal 0
HcmV?d00001

diff --git a/mime/application/x-gzip.png b/mime/application/x-gzip.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2b67dcba225336fb6700f8b7db79813f56873eb
GIT binary patch
literal 1078
zcmV-61j+k}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#$Vo&&RCwBA
z{Qv(yLwI;N0}QaTvRVZN1#REIfB%aqQ>Hj^aq&G(NSwfM<N8GgadANg9sxFn>sO95
zT)uRe;mel~3;+Q*npYfvVHgOatD>TWTMDfugPyar*NxYke(>mNwhxs6NgxR`yCb5x
z`_X&5#yG*8;LNutin*&MmexOf1P}{|;ACTF`0<aEfsOI64p4#KqD6}tUcG$AU|?Vv
zsG#7rNLWNr$kNVIlwVLtl%1WA|MRD>*DqZ>k_L4AHGlwO1bJa;o+889?<NfIf3SoK
ziOa0~`Qs}i2L~U6ik1t5s)h{%<9`;g3qQR7!SL?gPloSb7#Q~M>VC6pN3ShF0D)Z~
z!TFgXhVKx=_B(<spSkrJxVZTkxcH?QxH!2O_HUf~|N5P0-(S3W{ps_^*B^iXeDmMI
zsZQO*BuC`f(M6>I0R%SS&)@&yj1n?&K^lq{cbWb(K7ICs;m@}#3><IIGnk1zW|05$
z;{Wv@_a1M*_NL*{557lVKfOEmTab~JnVC%-Ab`LIh^lB#HgNM6Wn^Y%Q2qUf;oJMa
z48PueU|^S!W8meMW@O;_&&}}nu_<HD@`<Z1DMW$1_ZJwDpzsF>Ag}?<ypkM@e9R0C
zPcJjD{Qk_q$HK<IpeV(_!1SDf;rCmhvcC)ryete~{xS*t|Ifq+3=TK|2q3Tlf7!(u
z8MxIM7`Q$%Fnqen!0`DgFhKwfVFYSs;bLIm7G+>y=VbW)n;B^BpWmPu{LjD$gbWM-
z0R%RHkyDn1fm4TpLGTmMR-i^!A)sL#Kuvr=1Gs^<3j%3&h9AFK{xCB!e*i`tSTo2N
zfB*s;@c%yx(EV}@3?e|caqu!QyyXEJ0CYAFkk1ZeGjTKg|MHdL=g+_YczAdOe*OB(
z_>TdY1{oO{0RjkYKvU<8b>>H|xR_d+@*5b*vxo?50G<7v;rGv%46p9}Ww>+W1H<KW
zKN$Y;#>on^^KE2jmu2B#`wtA7-;4kO1WrhHc7Y;aKffwq`uo{D*x%P#Qk<EQUx1O}
z-ybc8x9=qxUcTjJ`0|Z|frAI=lE42MfX-z&eSXTn?YsJF0Rjl@0zbc?&FUIz7FVv^
z_;>dF(Z32mgjk*)d-4C|$)gXMnb=;ju>NCV0y>)E{~rb>#{bM;zP|hU`02GRfB*jL
z0|+3n0e9|P=jP`ZW_a}QF4Oj{%NAN#nA<*k_JZr)y=%Te=_?F)06+jSfV=?IY^<SS
wxKl(#Vl^;a#QFL8#ei~pK+MEI000CS00>B67cxNp$p8QV07*qoM6N<$f*ipH(f|Me

literal 0
HcmV?d00001

diff --git a/mime/audio.png b/mime/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..f88632dcd30be1945bb637ebf3e65193fafe2b6f
GIT binary patch
literal 979
zcmV;^11$WBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Wl2OqRCwBA
z{Qv(y1G9i3!@pm@7}#X>8Gb*z&G4Vkg@J+LKLf+Re^B}l0|O%mm$a(b4pjvKt5YXW
zUi)@?o;w4>@8<vk#KeFO{sT3Ayu`rp<t78epO-+*pMjbg_~ev@4hLEMwM}<tVGi(d
z)@5MVnF~@55J1=s_<DnZ;oAeC0dIixdnPqK<=y3JdPZ`>{}>pVSQ)&mB^V@?4DEob
z)c^tr(*Q7FV_*O(WcdA$g;QSTKz>=M86V?IhX0KJ8N?*S7~~{48C2AjxfmEYoB#p{
zhXFu;|N73rAtATXrzpqPP?Lk<*7fTkuQ0H&voZ(@a4{$=iU4`6S^xorW&lv^&o3bT
zg@H|4d$Ub`rPpUJNrrnj-!eRTd>1Iq#K6qN%)kjWL_&z0fsut-6d-_DK-&KO{l&!a
z^Q+e1Z=X$>L=?4!B;=jUk_rqz@F+0cy~4nd<nWV$jYEjx$&(ihzkdH>U}a-t;OAyz
zU}9w80tg_m0fM@YXJrf>wRlD4S-8X`n53nI8NUDJWVi{mR8s*M98CWhTwMJa9zDI!
zaO1`;25l{Epi6)O%J`2NAb`LIn0tBZsknMGJ$}N#zzp=oS71bZ{>H$dEXBYe!4FCf
zj10GKJY-<yWMTOH`4a;R3k$>VUq65m_V*t^0D;3m_V?rO+CYVWfa!$=D8d8`LqT2!
z20maoGXbsm#mL6+=IvXC^XJYp$jHbreE<H7;meoLK!g8$0|+3n0ryTHcqjr?$OH_(
z?{EGye0lzh;rADy&0l{re0m4Ozu6cbJiN*vBFe@fFE7vV<=Z!gS8rYbUGVEQKmdWg
zaQf)Zg~I)lJMX;|V)*j@1H<3nKNvV<R2c-s^%(vF4N)>>V~|#sW>A$A2l|^4=#8%o
zw{Khndi4KQfB*s;@afZsNvo$9u>Akeqze@M#K7?PBLfSc9Gj%8FT;OZF5XWz4ECn_
zK&hudXa8e(^ynGGgL_xM1GOFl2p|?{0{HR&|Gze%qY+8s&nJdokJoB3FzlXs@rbXT
zvQ|8klsM4upMNkMICzNR(SzGpfvT<n1P}u#H{u0MU_1N;WKC{HCl>#2Z0!0kC$9vu
zJqRQL5I}?tU}lH0xVX5uJNWqpj|15SFhPI-0|32vB%7nJW()uT002ovPDHLkV1hw`
Bz%2j(

literal 0
HcmV?d00001

diff --git a/mime/image.png b/mime/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1c85726f6727c6ce96a4d484af2b29f6bf76023
GIT binary patch
literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!*-1n}RCwBA
z{Qv(yLrqQ11$TFMoj-s6{D%St5MX3vM4@4Ti;Iit(4j-$>g(&10Ro5tq<H`S{eS-x
z3I6^22d1xGyY^p9Ol&7W02;^O1^^HSfv8=i`)}1TOtBUdUp%-Rn2djt<P$~&RwV`s
zDwMOyodq6)yQANVwJU&FU>ZT-_wU~fPo6wxxN-dk!w*J5hA%(=GB7g(<$wKW`2OV&
zgOmsdgM=6hgS@;P1JvSw00G1T^W%pP?-}mhyU+0B`*#MQI~g`T;$ZkCBFn(T_MhR!
zdq#%C+kY^)h(Bd$&S7Er{pT+O&?{g=00IbZz`J+v8Q56a8I+Zj84e#l%Alnq#$c*1
z&hYm)1H<8mKySTcWMKaCo8kYTcR&mNgAD+A7a)M(UJwuv02=~~2%vwN8D3pFz`(?*
z%JBa63x=x)&M|y@F2leo$-}_FtO?Zk52y#?0)PO58^F)c4;K9K^EU$v6C=aUSse^Z
zI)JWX`^WJ7$twnsi}izofQC0SKq47J0t67;0A^rlv9N%=@`izflbazcE0^Kc&6^CI
zoLpeJuU|eh7@L?e{QUJB97ZrN00a=&09b(V@bCa*;W<zf4?{viD#Pc`pBTP={l>t`
z$_7;PA51@edIzi?rUxK^VCewN5fTz&xO?{@FdRMsW8^L{T7NOTc<~(U3N|)2Am#uY
z2nuwV3jhKL#Q+WtPGB<S1bT%XsPPHIw{PEo3jcso2vAN4DE^m0OiTo904O1W06+k-
zz|uF!L{LH!6%}T9|NaAmw6qk^$t*zIIl;DrECGcTNFzuc%nJYk1U7()iHQ-2fwpik
zC@U*NQ|5oD!4QrA{{02117lEF0W%cHCCmT;1UBI4(WBpWbac4Ce*Frz2^)sF62$)a
z@gu|O)2BgR{0b02j35DSZthqqDXBD|O`v@HkAVOHx`O4+n>XKp2K5637y#;?rzp88
R@Xi1L002ovPDHLkV1iSOXmbDn

literal 0
HcmV?d00001

diff --git a/mime/text.png b/mime/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c3b4b00cc76a551ca8d595f2a94715c40d44f47
GIT binary patch
literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!a7jc#RCwBA
ztg5Oy?cw2J%)rR-9|#y2fCvT{8Nnoy00RRPBNGEV8yn;P0|&mhw6qie1YlXtjQ{{)
z7zomd`|rRpCE!ZPz@K<Evze|i^Ef5?x0m@uY@TorxCK-VbL#zwG!Ri;0*D2q9%Sj8
zr#~6~fmqW28UFqH2XqOL24bK|2pTB=_wPRjaWP(oe}DgioXh|aKrDZO43HyP*&&J;
zSQ){-0Q&~W{r4a2Hy~yN8}RQhBLg!NBg0>yT98Ws0*D2q38djS&}5KXnEwD3{RUzN
z2>(CSc94N!7l2&?!5}$+0AhiK8OS9d8ySE${QLh8su5%W#OWXi68{S}<UiN|P>2Hr
z5DUmJAi%@~;{Ib`W@chw1PTFN48$OXpwRyhb^#aw8H`|Yh!{Wsv48^z2!H?k3kk$O
zK&SqN2H^j{aNEJ*0do3Z2>uUtE&~HV0I`6b%D@2k(|>TF!PsC|!r2fS%7%syKmf78
z0tguAptJ-Q{0p`fWF-S6JpMua4-Hzd>!7i~01!Y-U}rNzFc^ZJ_79pOA?X3c0jEl^
z7{qXx7XSi?1;k~9`WK>>5$0})bHR50hdZAEWZ_?k?H~XUKwvL`oc#0mA8=x422y{2
zqekO@aH?crfT;b)@CQUgQzAeBu`mIX6)Q6f0}n4Z*l%21EN}z<!4nZQTtI08sF914
zlYxVS6X-2QCV&89Id|^-cMD5Pj$e$wfHCox;nzDxcnE`i408noA{O2={bsm)`7*=j
z&!2w*1P~)PH+Q0xlvElc&>`SF_zyWdGr|o*76W3I*RNlHegFRbB!B<|0Ewa@t7QIk
QF#rGn07*qoM6N<$f+TSxV*mgE

literal 0
HcmV?d00001

diff --git a/mime/text/html.png b/mime/text/html.png
new file mode 100644
index 0000000000000000000000000000000000000000..f56567f11223ed61f143d8362429a85037c596ff
GIT binary patch
literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Nl8RORCwBA
ztg5Oy?cw2J%)r3#9|#!G0V5+L3ZIFIiGhucjq$*N1K(R(S_%LHh+)T$9Y6l#1ONX1
z|NHmv|382J{Qvdq*Z-eCe}aWCU%vcbUS9qXKmZQMAO!#zgkg0EyZHaF4it6Po^lAG
zS~HeM0P#pe(0HDR$mOeo?1D$FV`l5~@fScWQ2h*l|NdiOWoBUb2Gn@-`A>$AU;i<%
zvobOK{Pl-{gZUqWsyGV+7Y7r=x1T_70lfjz2XYBO0KpAlW&Y3b@!Ma9omamx2=lQs
z=qqwFFaZsG|Md^U<F|hqc3k_yV5|I}L5Q1y;oskXFasC>0*DC~IDdfx%T9e@c=wBe
z!CaM>fuECs;rY9-4DUYwU=ZN^!*KJ(JBC?%p8>t~kAa2hKimL-0Ac|K5ZHhxZ+|ju
zJ@be`O+$g<;(G>$E2l0nT)B3Ofti(!;o<Z542RF%We^sXWAHQZV6YJ8V}QjNKmf7)
zgEGGSVq$oB`!2(gL&q83d<<fc5>sZl^65Flv3-Xb{xYyIXqlQZNDA>YJb(Qa=m&@k
zKmZ_sSpNTm7{JNOz`(~V$iV#i8^il={}}|i_!;C3tr>3L{luWEp~xVuAkXmc?MnuJ
zZYGA`Kv%=O01!Ydz=#H=AqENF{|ug%stkH&Mhx0o5)5xYGcfRr@G(S1dojpL@GyM+
z@R{M$&tD8uLR<`gz%GDT3=lvpAX9+pgn<cYNVJt8!@hgKcxU*<z|Y6Vz{1SLz^A~^
z@b}kmhF9<2GT0e#GYIl>0i*UW1IS{KUVs2%fdmF9;rwHe;AduVSNXwk_Wo0bi%*ys
zKL2E5kmCQ%AjS2S!AO*eL0*a<td14xd=LN#AQqTk{{8z4OeBm9Je({H4jP;c`qDoc
zK7akmzzU2q0bV`^7FHIZ{2vBTtU+82p#cJjg_)U|k%a}A%DA{71_2FbWcbG*$;rha
z2~r3Y`2FV}!yljq4h|NuMovynFa~BcCV&89Id|^dcMA&(j^Dq3Gr-aWIEwy*(0{O@
zFz3S9Ahp2E#PIp^=U)H;#K_IfohT(Gl?F=9{~=L=l9kc3I7keLSzf<>{q_C(_mcnu
Z3;?bQzDi!$Q~>}0002ovPDHLkV1lBoxtag~

literal 0
HcmV?d00001

diff --git a/mime/video.png b/mime/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..d050afa49b9e71999069d13d604407806e91820c
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!SV=@dRCwBA
z{Qv(y10?_;fEb80fQf~LMMpwHBFE9uaeGlw@iRt7Mir1=fB<5_qe+H`hsV_3-rkXe
zgVWZ~&`8hK)q`o$q<)5f|CoL-Gc&6I)!YFHAV!cWK+`}PgoT8JjKsyo9h8+-9J8`=
zjJIyx!shDg&T#eWHHKx&7TsiH<2-Wl;<*F={{1}xRR0L5_ZL6_ferBW_1z>QB4!Q*
zVj3FS3|(Dq|JBsAZf@MT_V|Mb_xA%89|huj*t`!AKwtwB5|YnIOUoMX-o5?zuV23}
zKYH}=$gf{NFEcVSz2N5N`u*q6A66zNW;SMKMkb&<BL@cu!-o$a-hBP~bw5A=fy3a*
zlSj9$t*wlMgM(Qe92^Z-tXN?b6BEsF<j64wPEK|PU0r>KHEUKe#K$KvY~8w*K}AKG
z;o!l84}n@000M{!WWc#|=hj}neEGG4f)c}zAHNtu8eYA6%b=j32sD73;pfj^44Rrc
z3@={1W>8bpVEFqNtmhU;FF*jnqp`BG`UH^u|I?@M|G$6#_y6<fpZ~vo`~CmNkH28C
zA3q>sApZC7fBu`An#}^~1qdMIXk-GJ4D=%yg8(#kz?Q(oe*gZ>0F60j5Fa3b;0FBr
z2U7G8tN;d(4M2#2eElCT1`t3<2K<BC{s+lXjIanpF_e)Jp#mU)Sdilsq#4x!OaL-~
ziHQ;J0)PO58^FxW!p6?d!NA7$gP;Kr7cjDdNPqx>8?blp?u$Qu{NVig^C#Zi#l*w}
sjMkt3?%cU`1jGjjAVx~FGeCd=0RK80<3*ZVO#lD@07*qoM6N<$f&|h=AOHXW

literal 0
HcmV?d00001

diff --git a/reset.css b/reset.css
new file mode 100644
index 0000000..15b4bb7
--- /dev/null
+++ b/reset.css
@@ -0,0 +1,66 @@
+/* --------------------------------------------------------------
+
+   reset.css
+   * Resets default browser CSS.
+
+-------------------------------------------------------------- */
+
+html {
+  margin:0;
+  padding:0;
+  border:0;
+}
+
+body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, code,
+del, dfn, em, img, q, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, dialog, figure, footer, header,
+hgroup, nav, section {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+
+/* This helps to make newer HTML5 elements behave like DIVs in older browers */
+article, aside, details, figcaption, figure, dialog,
+footer, header, hgroup, menu, nav, section {
+    display:block;
+}
+
+/* Line-height should always be unitless! */
+body {
+  line-height: 1.5;
+  background: white;
+/*  direction:rtl; */
+}
+
+/* Tables still need 'cellspacing="0"' in the markup. */
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+}
+/* float:none prevents the span-x classes from breaking table-cell display */
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+  float:none !important;
+}
+table, th, td {
+  vertical-align: middle;
+}
+
+/* Remove possible quote marks (") from <q>, <blockquote>. */
+blockquote:before, blockquote:after, q:before, q:after { content: ''; }
+blockquote, q { quotes: "" ""; }
+
+/* Remove annoying border on linked images. */
+a img { border: none; }
+
+/* Remember to define your own focus styles! */
+:focus { outline: 0; }
diff --git a/right.png b/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9096960ba15ebe17c20472b394ff47731417f22
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&aw@+MCg#}JR>Pp94HY%t()^^ZLuDC1~;LGbPZ<(s}oI3M}5vIc5-2JD&8
zKdp#=VSltnFpJuPV-A87VqQ(yyVL5)nHb(n44+vYSTFsP7HZhXaEbBp*;y<+2R8Y3
zILcZHdV8E;)?UiR-ucyT#;n~km&5Nodp~Qp&GluCkA-IHE&TuE_9mvYSI+o9*}nNY
P&@~L6u6{1-oD!M<LMKoP

literal 0
HcmV?d00001

diff --git a/templates/admin.cat.tpl b/templates/admin.cat.tpl
new file mode 100644
index 0000000..02492b4
--- /dev/null
+++ b/templates/admin.cat.tpl
@@ -0,0 +1,4 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('categorylist')); ?></h3>
+  <?php $this->display('common.cat.tpl'); ?>
+</div>
diff --git a/templates/admin.editallusers.tpl b/templates/admin.editallusers.tpl
new file mode 100644
index 0000000..3f3404c
--- /dev/null
+++ b/templates/admin.editallusers.tpl
@@ -0,0 +1,7 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolbox')); ?> :: <?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('editallusers')); ?></h3>
+
+    <?php
+    $this->display('common.editallusers.tpl');
+    ?>
+</div>
diff --git a/templates/admin.editgroup.tpl b/templates/admin.editgroup.tpl
new file mode 100644
index 0000000..6bfbca8
--- /dev/null
+++ b/templates/admin.editgroup.tpl
@@ -0,0 +1,4 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolboxlong')); ?> :: <?php echo Filters::noXSS(L('editgroup')); ?></h3>
+  <?php $this->display('common.editgroup.tpl'); ?>
+</div>
diff --git a/templates/admin.groups.tpl b/templates/admin.groups.tpl
new file mode 100644
index 0000000..a292e1e
--- /dev/null
+++ b/templates/admin.groups.tpl
@@ -0,0 +1,42 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('usersandgroups')); ?></h3>
+  <p>
+    <!--<img src="<?php echo Filters::noXSS($this->get_image('personal')); ?>" alt="" class="middle" /> --><a href="<?php echo Filters::noXSS(CreateURL('admin', 'newuser', $proj->id)); ?>"><?php echo Filters::noXSS(L('newuser')); ?></a>
+  </p>
+  <p>
+    <!--<img src="<?php echo Filters::noXSS($this->get_image('personal')); ?>" alt="" class="middle" /> --><a href="<?php echo Filters::noXSS(CreateURL('admin', 'newuserbulk', $proj->id)); ?>"><?php echo Filters::noXSS(L('newuserbulk')); ?></a>
+  </p>
+  <p>
+    <!--<img src="<?php echo Filters::noXSS($this->get_image('kuser')); ?>" alt="" class="middle" />--> <a href="<?php echo Filters::noXSS(CreateURL('admin', 'newgroup', $proj->id)); ?>"><?php echo Filters::noXSS(L('newgroup')); ?></a>
+  </p>
+  <p>
+    <!--<img src="<?php echo Filters::noXSS($this->get_image('personal')); ?>" alt="" class="middle" /> --><a href="<?php echo Filters::noXSS(CreateURL('admin', 'editallusers', $proj->id)); ?>"><?php echo Filters::noXSS(L('editallusers')); ?></a>
+  </p>
+  
+  <div class="groupedit">
+    <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+        <ul class="form_elements">
+          <li>
+            <label for="selectgroup"><?php echo Filters::noXSS(L('editgroup')); ?></label>
+            <select name="id" id="selectgroup"><?php echo tpl_options(Flyspray::ListGroups()); ?></select>
+            <button type="submit"><?php echo Filters::noXSS(L('edit')); ?></button>
+            <input type="hidden" name="do" value="admin" />
+            <input type="hidden" name="area" value="editgroup" />
+          </li>
+        </ul>
+    </form>
+    
+    <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+        <ul class="form_elements">
+          <li>
+            <label for="edit_user"><?php echo Filters::noXSS(L('edituser')); ?></label>
+            <?php echo tpl_userselect('user_name', '', 'edit_user'); ?>       
+            <button type="submit"><?php echo Filters::noXSS(L('edit')); ?></button>
+    
+            <input type="hidden" name="do" value="admin" />
+            <input type="hidden" name="area" value="users" />
+          </li>
+        </ul>
+    </form> 
+  </div>
+</div>
diff --git a/templates/admin.menu.tpl b/templates/admin.menu.tpl
new file mode 100644
index 0000000..dca2b41
--- /dev/null
+++ b/templates/admin.menu.tpl
@@ -0,0 +1,34 @@
+<?php $activeclass = ' class="active" '; ?>
+
+<div id="toolboxmenu">
+  <a id="globprefslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'prefs') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'prefs')); ?>"><?php echo Filters::noXSS(L('preferences')); ?></a>
+  <a id="globuglink"
+     <?php if(isset($_GET['area']) and in_array($_GET['area'], array('groups','newuser', 'newuserbulk', 'newgroup','editgroup', 'users', 'editallusers'))) echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'groups')); ?>"><?php echo Filters::noXSS(L('usersandgroups')); ?></a>
+  <a id="globttlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'tasktype') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'tasktype')); ?>"><?php echo Filters::noXSS(L('tasktypes') ); ?></a>
+  <a id="globstatuslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'status') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'status')); ?>"><?php echo Filters::noXSS(L('taskstatuses') ); ?></a>
+  <a id="globreslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'resolution') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'resolution')); ?>"><?php echo Filters::noXSS(L('resolutions') ); ?></a>
+  <a id="globcatlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'cat') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'cat')); ?>"><?php echo Filters::noXSS(L('categories') ); ?></a>
+  <a id="globoslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'os') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'os')); ?>"><?php echo Filters::noXSS(L('operatingsystems')); ?></a>
+  <a id="globverlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'version') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'version')); ?>"><?php echo Filters::noXSS(L('versions') ); ?></a>
+  <a id="globnewprojlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'newproject') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'newproject')); ?>"><?php echo Filters::noXSS(L('newproject')); ?></a>
+  <a id="userrequestlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'userreqeust') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('admin', 'userrequest')); ?>"><?php echo Filters::noXSS(L('pendingnewuserrequest')); ?></a>
+</div>
diff --git a/templates/admin.newgroup.tpl b/templates/admin.newgroup.tpl
new file mode 100644
index 0000000..af4a758
--- /dev/null
+++ b/templates/admin.newgroup.tpl
@@ -0,0 +1,7 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolbox')); ?> :: <?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('createnewgroup')); ?></h3>
+
+    <?php
+    $this->display('common.newgroup.tpl');
+    ?>
+</div>
diff --git a/templates/admin.newproject.tpl b/templates/admin.newproject.tpl
new file mode 100644
index 0000000..42fb37e
--- /dev/null
+++ b/templates/admin.newproject.tpl
@@ -0,0 +1,66 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('createnewproject')); ?></h3>
+  <form action="<?php echo Filters::noXSS(CreateURL('admin', 'newproject')); ?>" method="post">
+    <div>
+      <input type="hidden" name="action" value="admin.newproject" />
+      <input type="hidden" name="area" value="newproject" />
+    </div>
+    <ul class="form_elements">
+      <li>
+        <label for="projecttitle"><?php echo Filters::noXSS(L('projecttitle')); ?></label>
+        <input id="projecttitle" name="project_title" value="<?php echo Filters::noXSS(Req::val('project_title')); ?>" type="text" class="required text" size="40" maxlength="100" />
+      </li>
+      
+      <li>
+        <label for="themestyle"><?php echo Filters::noXSS(L('themestyle')); ?></label>
+        <select id="themestyle" name="theme_style">
+          <?php echo tpl_options(Flyspray::listThemes(), Req::val('theme_style', $proj->prefs['theme_style']), true); ?>
+
+        </select>
+      </li>
+      
+      <li>
+        <label for="langcode"><?php echo Filters::noXSS(L('language')); ?></label>
+        <select id="langcode" name="lang_code">
+          <?php echo tpl_options(Flyspray::listLangs(), Req::val('lang_code', $fs->prefs['lang_code']), true); ?>
+
+        </select>
+      </li>
+      
+      <li>
+        <label for="intromesg"><?php echo Filters::noXSS(L('intromessage')); ?></label>
+        <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <div class="hide preview" id="preview"></div>
+        <?php endif; ?>
+        <?php echo TextFormatter::textarea('intro_message', 8, 70, array('accesskey' => 'r', 'tabindex' => 8, 'id' => 'intromesg'), Req::val('intro_message', $proj->prefs['intro_message'])); ?>
+
+        <br />
+        <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <button tabindex="9" type="button" onclick="showPreview('intromesg', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+        <?php endif; ?>
+      </li>
+      
+      <li>
+        <label for="othersview"><?php echo Filters::noXSS(L('othersview')); ?></label>
+        <?php echo tpl_checkbox('others_view', Req::val('others_view', Req::val('action') != 'admin.newproject'), 'othersview'); ?>
+
+      </li>
+      
+      <li>
+        <label for="anonopen"><?php echo Filters::noXSS(L('allowanonopentask')); ?></label>
+        <?php echo tpl_checkbox('anon_open', Req::val('anon_open'), 'anonopen'); ?>
+
+      </li>
+
+      <li>
+         <label for="disp_intro"><?php echo Filters::noXSS(L('dispintro')); ?></label>
+	 <?php echo tpl_checkbox('disp_intro', Req::val('disp_intro', 0), 'dispintro'); ?>
+
+     </li>
+      
+      <li>
+        <td class="buttons" colspan="2"><button type="submit"><?php echo Filters::noXSS(L('createthisproject')); ?></button></td>
+      </li>
+    </ul>
+  </form>
+</div>
diff --git a/templates/admin.newuser.tpl b/templates/admin.newuser.tpl
new file mode 100644
index 0000000..825ab82
--- /dev/null
+++ b/templates/admin.newuser.tpl
@@ -0,0 +1,7 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolbox')); ?> :: <?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('newuser')); ?></h3>
+
+    <?php
+    $this->display('common.newuser.tpl');
+    ?>
+</div>
diff --git a/templates/admin.newuserbulk.tpl b/templates/admin.newuserbulk.tpl
new file mode 100644
index 0000000..189e04f
--- /dev/null
+++ b/templates/admin.newuserbulk.tpl
@@ -0,0 +1,7 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolbox')); ?> :: <?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('newuserbulk')); ?></h3>
+
+    <?php
+    $this->display('common.newuserbulk.tpl');
+    ?>
+</div>
diff --git a/templates/admin.os.tpl b/templates/admin.os.tpl
new file mode 100644
index 0000000..4bbe0da
--- /dev/null
+++ b/templates/admin.os.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('oslist')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'os');
+  $this->assign('rows', $proj->listOs(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/admin.prefs.tpl b/templates/admin.prefs.tpl
new file mode 100644
index 0000000..360ea7d
--- /dev/null
+++ b/templates/admin.prefs.tpl
@@ -0,0 +1,302 @@
+<script type="text/javascript">
+
+    function ShowHidePassword(id)
+    {
+        if(document.getElementById(id).type=="text")
+        {
+            document.getElementById(id).type="password";
+        }
+        else
+        {
+            document.getElementById(id).type="text";
+        }
+    }
+
+</script>
+
+
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolboxlong')); ?> :: <?php echo Filters::noXSS(L('preferences')); ?></h3>
+
+  <form action="<?php echo Filters::noXSS(CreateURL('admin', 'prefs')); ?>" method="post" enctype="multipart/form-data">
+  <ul id="submenu">
+   <li><a href="#general"><?php echo Filters::noXSS(L('general')); ?></a></li>
+   <li><a href="#userregistration"><?php echo Filters::noXSS(L('userregistration')); ?></a></li>
+   <li><a href="#notifications"><?php echo Filters::noXSS(L('notifications')); ?></a></li>
+   <li><a href="#lookandfeel"><?php echo Filters::noXSS(L('lookandfeel')); ?></a></li>
+  </ul>
+  
+   <div id="general" class="tab">
+      <ul class="form_elements">
+        <li>
+          <label for="pagetitle"><?php echo Filters::noXSS(L('pagetitle')); ?></label>
+          <input id="pagetitle" name="page_title" type="text" class="text" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['page_title']); ?>" />
+        </li>   
+
+        <li>
+          <label for="defaultproject"><?php echo Filters::noXSS(L('defaultproject')); ?></label>
+          <select id="defaultproject" name="default_project">
+            <?php echo tpl_options(array_merge(array(0 => L('allprojects')), Flyspray::listProjects()), $fs->prefs['default_project']); ?>
+
+          </select>
+        </li>   
+
+        <li>
+          <label for="langcode"><?php echo Filters::noXSS(L('language')); ?></label>
+          <select id="langcode" name="lang_code">
+            <?php echo tpl_options(Flyspray::listLangs(), $fs->prefs['lang_code'], true); ?>
+
+          </select>
+        </li>   
+
+        <li>
+          <label for="emailNoHTML"><?php echo Filters::noXSS(L('emailNoHTML')); ?></label>
+        	<?php echo tpl_checkbox('emailNoHTML', $fs->prefs['emailNoHTML'], 'emailNoHTML'); ?>
+
+        </li>	
+		
+        <li>
+          <?php
+            if (! array_key_exists( 'logo', $fs->prefs) )
+            {
+              $fs->prefs['logo'] = '';
+            }
+
+          ?>
+          <label for="logo"><?php echo Filters::noXSS(L('showlogo')); ?></label>
+          <input id="logo" name="logo" type="file" accept="image/*" value="<?php echo Filters::noXSS($fs->prefs['logo']); ?>" />
+        </li>
+
+        <li>
+          <label for="gravatars"><?php echo Filters::noXSS(L('showgravatars')); ?></label>
+        	<?php echo tpl_checkbox('gravatars', $fs->prefs['gravatars'], 'gravatars'); ?>
+
+        </li>
+        
+        <li>
+          <label for="dateformat"><?php echo Filters::noXSS(L('dateformat')); ?></label>
+          <input id="dateformat" name="dateformat" type="text" class="text" size="40" maxlength="30" value="<?php echo Filters::noXSS($fs->prefs['dateformat']); ?>" />
+        </li>   
+
+        <li>
+          <label for="dateformat_extended"><?php echo Filters::noXSS(L('dateformat_extended')); ?></label>
+          <input id="dateformat_extended" name="dateformat_extended" class="text" type="text" size="40" maxlength="30" value="<?php echo Filters::noXSS($fs->prefs['dateformat_extended']); ?>" />
+        </li>   
+
+        <li>
+          <label for="cache_feeds"><?php echo Filters::noXSS(L('cache_feeds')); ?></label>
+          <select id="cache_feeds" name="cache_feeds">
+          <?php echo tpl_options(array('0' => L('no_cache'), '1' => L('cache_disk'), '2' => L('cache_db')), $fs->prefs['cache_feeds']); ?>
+
+          </select>
+        </li>
+
+        <li>
+          <label for="disable_lostpw"><?php echo Filters::noXSS(L('disable_lostpw')); ?></label>
+          <?php echo tpl_checkbox('disable_lostpw', $fs->prefs['disable_lostpw'], 'disable_lostpw'); ?>
+
+        </li>
+
+        <li>
+          <label for="disablechangepw"><?php echo Filters::noXSS(L('disable_changepw')); ?></label>
+          <?php echo tpl_checkbox('disable_changepw', $fs->prefs['disable_changepw'], 'disablechangepw'); ?>
+
+        </li>
+
+        <li>
+          <label for="days_before_alert"><?php echo Filters::noXSS(L('daysbeforealert')); ?></label>
+          <input id="days_before_alert" name="days_before_alert" type="text" class="text" size="3" maxlength="3" value="<?php echo Filters::noXSS($fs->prefs['days_before_alert']); ?>" />
+        </li>
+
+          <li>
+          <label for="intromesg"><?php echo Filters::noXSS(L('mainmessage')); ?></label>
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <div class="hide preview" id="preview"></div>
+          <?php endif; ?>
+          <?php echo TextFormatter::textarea('intro_message', 8, 70, array('accesskey' => 'r', 'tabindex' => 8, 'id' => 'intromesg'), Post::val('intro_message', $fs->prefs['intro_message'])); ?>
+
+          <br />
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <button tabindex="9" type="button" onclick="showPreview('intromesg', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+          <?php endif; ?>
+        </li>
+      </ul>
+    </div>
+
+    <div id="userregistration" class="tab">
+      <ul class="form_elements">
+        <li>
+          <label for="allowusersignups"><?php echo Filters::noXSS(L('anonreg')); ?></label>
+          <?php echo tpl_checkbox('anon_reg', $fs->prefs['anon_reg'], 'allowusersignups'); ?>
+
+        </li>   
+
+<!-- register needs approved by admin !-->
+        <li>
+	  <script>
+		function check_change()
+		{
+			if(document.getElementById("needapproval").checked)
+			{
+				document.getElementById("spamproof").checked = false;
+				document.getElementById("spamproof").disabled = true;
+			}
+			else
+			{
+				document.getElementById("spamproof").disabled = false;
+			}
+		}
+	  </script>
+          <label for="needapproval"><?php echo Filters::noXSS(L('regapprovedbyadmin')); ?></label>
+          <?php echo tpl_checkbox('need_approval', $fs->prefs['need_approval'], 'needapproval', 1, array('onclick'=>'check_change()')); ?>
+
+        </li>
+
+        <li>
+          <label for="spamproof"><?php echo Filters::noXSS(L('spamproof')); ?></label>
+          <?php echo tpl_checkbox('spam_proof', $fs->prefs['spam_proof'], 'spamproof', 1, $fs->prefs['need_approval']?array('disabled'=>'true'):''); ?>
+
+        </li>   
+
+        <li>
+          <label for="notify_registration"><?php echo Filters::noXSS(L('notify_registration')); ?></label>
+          <?php echo tpl_checkbox('notify_registration', $fs->prefs['notify_registration'], 'notify_registration'); ?>
+
+        </li>   
+
+        <li>
+          <label for="defaultglobalgroup"><?php echo Filters::noXSS(L('defaultglobalgroup')); ?></label>
+          <select id="defaultglobalgroup" name="anon_group">
+            <?php echo tpl_options(Flyspray::listGroups(), $fs->prefs['anon_group']); ?>
+
+          </select>
+        </li>   
+      </ul>
+    </div>
+
+    <div id="notifications" class="tab">
+      <ul class="form_elements">
+        <li>
+          <label for="usernotify"><?php echo Filters::noXSS(L('forcenotify')); ?></label>
+          <select id="usernotify" name="user_notify">
+            <?php echo tpl_options(array(L('neversend'), L('userchoose'), L('email'), L('jabber')), $fs->prefs['user_notify']); ?>
+
+          </select>
+        </li>
+      </ul>
+      
+      <fieldset><legend><?php echo Filters::noXSS(L('emailnotify')); ?></legend>
+        <ul class="form_elements">
+          <li>
+            <label for="adminemail"><?php echo Filters::noXSS(L('fromaddress')); ?></label>
+            <input id="adminemail" name="admin_email" class="text" type="text" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['admin_email']); ?>" />
+          </li>
+  
+          <li>
+            <label for="smtpserv"><?php echo Filters::noXSS(L('smtpserver')); ?></label>
+            <input id="smtpserv" name="smtp_server" class="text" type="text" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['smtp_server']); ?>" />
+            <?php if (extension_loaded('openssl')) : ?>
+            <?php echo tpl_checkbox('email_ssl', $fs->prefs['email_ssl'], 'email_ssl'); ?> <label class="inline" for="email_ssl"><?php echo Filters::noXSS(L('ssl')); ?></label>
+            <?php echo tpl_checkbox('email_tls', $fs->prefs['email_tls'], 'email_tls'); ?> <label class="inline" for="email_tls"><?php echo Filters::noXSS(L('tls')); ?></label>
+            <?php endif; ?>
+          </li>
+  
+          <li>
+            <label for="smtpuser"><?php echo Filters::noXSS(L('smtpuser')); ?></label>
+            <input id="smtpuser" name="smtp_user" class="text" type="text" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['smtp_user']); ?>" />
+          </li>
+  
+          <li>
+            <label for="smtppass"><?php echo Filters::noXSS(L('smtppass')); ?></label>
+            <input id="smtppass" name="smtp_pass" class="text" type="password" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['smtp_pass']); ?>" />
+          </li>
+          <li>
+              <label for="showsmtppass"><?php echo Filters::noXSS(L('showpass')); ?></label>
+              <input id="showsmtppass" name="show_smtp_pass" class="text" type="checkbox"  onclick="ShowHidePassword('smtppass')"/>
+          </li>
+        </ul>
+      </fieldset>
+  
+      <fieldset><legend><?php echo Filters::noXSS(L('jabbernotify')); ?></legend>
+        <ul class="form_elements">
+          <li>
+            <label for="jabberserver"><?php echo Filters::noXSS(L('jabberserver')); ?></label>
+            <input id="jabberserver" class="text" type="text" name="jabber_server" size="25" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['jabber_server']); ?>" />
+            <?php if(extension_loaded('openssl')) : ?>
+              <select id="jabber_ssl" name="jabber_ssl">
+                <?php echo tpl_options(array('0' => L('none'), '1' => L('ssl'), '2' => L('tls')), $fs->prefs['jabber_ssl']); ?>
+
+              </select>
+              <label class="inline" for="jabber_ssl"><?php echo Filters::noXSS(L('ssl')); ?> / <?php echo Filters::noXSS(L('tls')); ?></label>
+            <?php endif; ?>
+          </li>
+  
+          <li>
+            <label for="jabberport"><?php echo Filters::noXSS(L('jabberport')); ?></label>
+            <input id="jabberport" class="text" type="text" name="jabber_port" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['jabber_port']); ?>" />
+          </li>
+  
+          <li>
+            <label for="jabberusername"><?php echo Filters::noXSS(L('jabberuser')); ?></label>
+            <input id="jabberusername" class="text" type="text" name="jabber_username" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['jabber_username']); ?>" />
+          </li>
+  
+          <li>
+            <label for="jabberpassword"><?php echo Filters::noXSS(L('jabberpass')); ?></label>
+            <input id="jabberpassword" name="jabber_password" class="text" type="password" size="40" maxlength="100" value="<?php echo Filters::noXSS($fs->prefs['jabber_password']); ?>" />
+          </li>
+
+          <li>
+              <label for="showjabberppass"><?php echo Filters::noXSS(L('showpass')); ?></label>
+              <input id="showjabberpass" name="show_jabber_pass" class="text" type="checkbox"  onclick="ShowHidePassword('jabberpassword')"/>
+          </li>
+
+        </ul>
+      </fieldset>
+    </div>
+
+    <div id="lookandfeel" class="tab">
+
+      <ul class="form_elements">
+        <li>
+          <label for="globaltheme"><?php echo Filters::noXSS(L('globaltheme')); ?></label>
+          <select id="globaltheme" name="global_theme">
+            <?php echo tpl_options(Flyspray::listThemes(), $fs->prefs['global_theme'], true); ?>
+
+          </select>
+        </li>
+  
+          <li>
+            <label><?php echo Filters::noXSS(L('visiblecolumns')); ?></label>
+            <?php // Set the selectable column names
+            $columnnames = array('id', 'parent', 'project', 'tasktype', 'category', 'severity',
+            'priority', 'summary', 'dateopened', 'status', 'openedby', 'private',
+            'assignedto', 'lastedit', 'reportedin', 'dueversion', 'duedate',
+            'comments', 'attachments', 'progress', 'dateclosed', 'os', 'votes');
+            $selectedcolumns = explode(" ", $fs->prefs['visible_columns']);
+            ?>
+            <?php echo tpl_double_select('visible_columns', $columnnames, $selectedcolumns, true); ?>
+
+          </li>
+
+          <li>
+            <label><?php echo Filters::noXSS(L('visiblefields')); ?></label>
+            <?php // Set the selectable field names
+            $fieldnames = array('parent', 'tasktype', 'category', 'severity', 'priority', 'status', 'private',
+            'assignedto', 'reportedin', 'dueversion', 'duedate', 'progress', 'os', 'votes');
+            $selectedfields = explode(" ", $fs->prefs['visible_fields']);
+            ?>
+            <?php echo tpl_double_select('visible_fields', $fieldnames, $selectedfields, true); ?>
+
+          </li>
+
+        </ul>
+    </div>
+    <div class="tbuttons">
+      <input type="hidden" name="action" value="globaloptions" />
+      <button type="submit"><?php echo Filters::noXSS(L('saveoptions')); ?></button>
+
+      <button type="reset"><?php echo Filters::noXSS(L('resetoptions')); ?></button>
+    </div>
+  </form>
+</div>
diff --git a/templates/admin.resolution.tpl b/templates/admin.resolution.tpl
new file mode 100644
index 0000000..e8b78dc
--- /dev/null
+++ b/templates/admin.resolution.tpl
@@ -0,0 +1,8 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('resolutionlist')); ?></h3>
+  <?php
+  $this->assign('list_type', 'resolution');
+  $this->assign('rows', $proj->listResolutions(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/admin.status.tpl b/templates/admin.status.tpl
new file mode 100644
index 0000000..c38e6a9
--- /dev/null
+++ b/templates/admin.status.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('taskstatuses')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'status');
+  $this->assign('rows', $proj->listTaskStatuses(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/admin.tasktype.tpl b/templates/admin.tasktype.tpl
new file mode 100644
index 0000000..0ceff33
--- /dev/null
+++ b/templates/admin.tasktype.tpl
@@ -0,0 +1,8 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('tasktypes')); ?></h3>
+  <?php
+  $this->assign('list_type', 'tasktype');
+  $this->assign('rows', $proj->listTaskTypes(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/admin.userrequest.tpl b/templates/admin.userrequest.tpl
new file mode 100644
index 0000000..8e06fb8
--- /dev/null
+++ b/templates/admin.userrequest.tpl
@@ -0,0 +1,49 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('pendingrequests')); ?></h3>
+  
+  <?php if (!count($pendings)): ?>
+  <?php echo Filters::noXSS(L('nopendingreq')); ?>
+
+  <?php else: ?>
+  <table class="requests">
+    <tr>
+      <th><?php echo Filters::noXSS(L('eventdesc')); ?></th>
+      <th><?php echo Filters::noXSS(L('requestedby')); ?></th>
+      <th><?php echo Filters::noXSS(L('daterequested')); ?></th>
+      <th><?php echo Filters::noXSS(L('emailaddress')); ?></th>
+      <th class="pm-buttons"> </th>
+    </tr>
+    <?php foreach ($pendings as $req): ?>
+    <tr>
+      <td>
+      New User Request
+      </td>
+      <td><?php echo tpl_userlink($req['submitted_by']); ?></td>
+      <td><?php echo Filters::noXSS(formatDate($req['time_submitted'], true)); ?></td>
+      <td>get email adress later</td>
+      <td>
+        <form style="display:inline" action="<?php echo Filters::noXSS(CreateUrl('edituser', $req['submitted_by'])); ?>" method="post">
+	<a class="button" href="#" onclick="this.parentNode.submit();"><?php echo Filters::noXSS(L('accept')); ?></a>
+	<input type="hidden" name="action" value="approve.user"/>
+	<input type="hidden" name="user_id" value="<?php echo $req['submitted_by']; ?>"/>
+	<input type="hidden" name="account_enabled" value="1"/>
+	</form>
+        <a href="#" class="button" onclick="showhidestuff('denyform<?php echo Filters::noXSS($req['request_id']); ?>');"><?php echo Filters::noXSS(L('deny')); ?></a>
+        <div id="denyform<?php echo Filters::noXSS($req['request_id']); ?>" class="denyform">
+          <form action="" method="post">
+            <div>
+              <input type="hidden" name="action" value="denyuserreq" />
+              <input type="hidden" name="req_id" value="<?php echo Filters::noXSS($req['request_id']); ?>" />
+              <label for="deny_reason<?php echo Filters::noXSS($req['request_id']); ?>" class="inline"><?php echo Filters::noXSS(L('reasonfordeinal')); ?></label><br />
+              <textarea cols="40" rows="5" name="deny_reason" id="deny_reason<?php echo Filters::noXSS($req['request_id']); ?>"></textarea>
+              <br />
+              <button type="submit"><?php echo Filters::noXSS(L('deny')); ?></button>
+            </div>
+          </form>
+        </div>
+      </td>
+    </tr>
+    <?php endforeach; ?>
+  </table>
+  <?php endif; ?>
+</div>
diff --git a/templates/admin.users.tpl b/templates/admin.users.tpl
new file mode 100644
index 0000000..090df26
--- /dev/null
+++ b/templates/admin.users.tpl
@@ -0,0 +1,5 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('admintoolboxlong')); ?> :: <?php echo Filters::noXSS(L('edituser')); ?> : <?php echo Filters::noXSS($theuser->infos['user_name']); ?></h3>
+  <fieldset><legend><?php echo Filters::noXSS(L('edituser')); ?></legend>
+  <?php $this->display('common.profile.tpl'); ?>
+</div>
diff --git a/templates/admin.version.tpl b/templates/admin.version.tpl
new file mode 100644
index 0000000..196fac9
--- /dev/null
+++ b/templates/admin.version.tpl
@@ -0,0 +1,8 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('versionlist')); ?></h3>
+  <?php
+  $this->assign('list_type', 'version');
+  $this->assign('rows', $proj->listVersions(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/common.attachments.tpl b/templates/common.attachments.tpl
new file mode 100644
index 0000000..eed3353
--- /dev/null
+++ b/templates/common.attachments.tpl
@@ -0,0 +1,44 @@
+  <?php
+  if ($attachments && $user->can_view_task($task_details)): ?>
+  <div class="attachments">
+  <?php foreach ($attachments as $attachment): ?>
+    <?php if (file_exists(BASEDIR . '/attachments/' . $attachment['file_name'])): ?>
+    <a title="<?php echo Filters::noXSS($attachment['orig_name']); ?>" href="?getfile=<?php echo Filters::noXSS($attachment['attachment_id']); ?>" <?php if (substr($attachment['file_type'], 0, 5) == 'image'): ?>rel="lightbox[bug]"<?php endif; ?>>
+    <?php else: ?>
+    <del>
+    <?php endif; ?>
+      <?php
+      // Strip the mimetype to get the icon image name
+      list($main) = explode('/', $attachment['file_type']);
+      $imgdir = BASEDIR . "/themes/<?php echo Filters::noXSS($proj->prefs['theme_style']); ?>/mime/";
+      $imgpath = "<?php echo Filters::noXSS($baseurl); ?>themes/<?php echo Filters::noXSS($proj->prefs['theme_style']); ?>/mime/";
+      if (file_exists($imgdir.$attachment['file_type'] . '.png')):
+      ?>
+      <img src="<?php echo Filters::noXSS($imgpath); ?><?php echo Filters::noXSS($attachment['file_type']); ?>.png" alt="(<?php echo Filters::noXSS($attachment['file_type']); ?>)" title="<?php echo Filters::noXSS($attachment['file_type']); ?>" />
+      <?php else: ?>
+      <img src="<?php echo Filters::noXSS($imgpath); ?><?php echo Filters::noXSS($main); ?>.png" alt="" title="<?php echo Filters::noXSS($attachment['file_type']); ?>" />
+      <?php endif; ?>
+      &nbsp;&nbsp;
+      <?php if (utf8_strlen($attachment['orig_name']) > 30): ?>
+      <?php echo Filters::noXSS(utf8_substr($attachment['orig_name'], 0, 29)); ?>...
+      <?php else: ?>
+      <?php echo Filters::noXSS($attachment['orig_name']); ?>
+
+      <?php endif; ?>
+      <?php if (file_exists(BASEDIR . '/attachments/' . $attachment['file_name'])): ?>
+      </a>
+      <?php else: ?>
+      </del>
+      <?php endif; ?>
+      <?php if ($attachment['file_size'] < 1000000): ?>
+      (<?php echo Filters::noXSS(round($attachment['file_size']/1024,1)); ?> <?php echo Filters::noXSS(L('KiB')); ?>)
+      <?php else: ?>
+      (<?php echo Filters::noXSS(round($attachment['file_size']/1024/1024,2)); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+      <?php endif; ?>
+    <br />
+  <?php endforeach; ?>
+  </div>
+  <?php elseif (count($attachments)): ?>
+  <div class="attachments"><?php echo Filters::noXSS(L('attachnoperms')); ?></div>
+  <?php endif; ?>
+
diff --git a/templates/common.cat.tpl b/templates/common.cat.tpl
new file mode 100644
index 0000000..30f3ca5
--- /dev/null
+++ b/templates/common.cat.tpl
@@ -0,0 +1,115 @@
+<p><?php echo Filters::noXSS(L('listnote')); ?></p>
+<?php
+$countlines = -1;
+$categories = $proj->listCategories($proj->id, false, false, false);
+$root = $categories[0];
+unset($categories[0]);
+
+if (count($categories)) : ?>
+<div id="controlBox">
+  <div class="grip"></div>
+  <div class="inner">
+      <a href="#" onclick="TableControl.up('catTable'); return false;"><img src="<?php echo Filters::noXSS($this->themeUrl()); ?>/up.png" alt="Up" /></a>
+      <a href="#" onclick="TableControl.down('catTable'); return false;"><img src="<?php echo Filters::noXSS($this->themeUrl()); ?>/down.png" alt="Down" /></a>
+      <a href="#" onclick="TableControl.shallower('catTable'); return false;"><img src="<?php echo Filters::noXSS($this->themeUrl()); ?>/left.png" alt="Left" /></a>
+      <a href="#" onclick="TableControl.deeper('catTable'); return false;"><img src="<?php echo Filters::noXSS($this->themeUrl()); ?>/right.png" alt="Right" /></a>
+  </div>
+</div>
+<?php endif; ?>
+  <form action="<?php echo Filters::noXSS(CreateURL($do, 'cat', $proj->id)); ?>" method="post">
+    <table class="list" id="catTable">
+       <thead>
+       <tr>
+         <th><?php echo Filters::noXSS(L('name')); ?></th>
+         <th><?php echo Filters::noXSS(L('owner')); ?></th>
+         <th><?php echo Filters::noXSS(L('show')); ?></th>
+         <th><?php echo Filters::noXSS(L('delete')); ?></th>
+       </tr>
+     </thead>
+     <tbody>
+      <?php
+      foreach ($categories as $row):
+          $countlines++;
+      ?>
+      <tr class="depth<?php echo Filters::noXSS($row['depth']); ?>">
+        <td class="first">
+          <input type="hidden" name="lft[<?php echo Filters::noXSS($row['category_id']); ?>]" value="<?php echo Filters::noXSS($row['lft']); ?>" />
+          <input type="hidden" name="rgt[<?php echo Filters::noXSS($row['category_id']); ?>]" value="<?php echo Filters::noXSS($row['rgt']); ?>" />
+          <span class="depthmark"><?php echo str_repeat('&rarr;', intval($row['depth'])); ?></span>
+          <input id="categoryname<?php echo Filters::noXSS($countlines); ?>" class="text" type="text" size="15" maxlength="40" name="list_name[<?php echo Filters::noXSS($row['category_id']); ?>]" 
+            value="<?php echo Filters::noXSS($row['category_name']); ?>" />
+        </td>
+        <td title="<?php echo Filters::noXSS(L('categoryownertip')); ?>">
+          <?php echo tpl_userselect('category_owner[' . $row['category_id'] . ']' . $countlines, $row['category_owner'], 'categoryowner' . $countlines); ?>
+
+        </td>
+        <td title="<?php echo Filters::noXSS(L('listshowtip')); ?>">
+          <?php echo tpl_checkbox('show_in_list[' . $row['category_id'] . ']', $row['show_in_list'], 'showinlist'.$countlines); ?>
+
+        </td>
+        <td title="<?php echo Filters::noXSS(L('listdeletetip')); ?>">
+          <input id="delete<?php echo Filters::noXSS($row['category_id']); ?>" type="checkbox"
+          <?php if ($row['used_in_tasks']): ?>disabled="disabled"<?php endif; ?>
+          name="delete[<?php echo Filters::noXSS($row['category_id']); ?>]" value="1" />
+        </td>
+      </tr>
+      <?php endforeach; ?>
+      </tbody>
+      <?php if($countlines > -1): ?>
+      <tr>
+        <td colspan="3"></td>
+        <td class="buttons">
+          <input type="hidden" name="action" value="update_category" />
+          <input type="hidden" name="list_type" value="category" />
+          <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+          <button type="submit"><?php echo Filters::noXSS(L('update')); ?></button>
+        </td>
+      </tr>
+      <?php endif; ?>
+    </table>
+    <?php if (count($categories)): ?>
+    <script type="text/javascript">
+      <?php
+          echo 'TableControl.create("catTable",{
+              controlBox: "controlBox",
+              tree: true,
+              spreadActiveClass: true
+          });';
+          echo 'new Draggable("controlBox",{
+              handle: "grip"
+          });';
+      ?>
+    </script>
+    <?php endif; ?>
+  </form>
+
+  <hr />
+
+  <!-- Form to add a new category to the list -->
+  <form action="<?php echo Filters::noXSS(CreateURL($do, 'cat', $proj->id)); ?>" method="post">
+    <table class="list">
+      <tr>
+        <td>
+          <input id="listnamenew" class="text" type="text" size="15" maxlength="40" name="list_name" />
+        </td>
+        <td title="<?php echo Filters::noXSS(L('categoryownertip')); ?>">
+          <?php echo tpl_userselect('category_owner', Req::val('category_owner'), 'categoryownernew'); ?>
+
+        </td>
+        <td title="<?php echo Filters::noXSS(L('categoryparenttip')); ?>">
+          <label for="parent_id"><?php echo Filters::noXSS(L('parent')); ?></label>
+          <select id="parent_id" name="parent_id">
+            <option value="<?php echo Filters::noXSS($root['category_id']); ?>"><?php echo Filters::noXSS(L('notsubcategory')); ?></option>
+            <?php echo tpl_options($proj->listCategories($proj->id, false), Req::val('parent_id')); ?>
+
+          </select>
+        </td>
+        <td class="buttons">
+          <input type="hidden" name="action" value="<?php echo Filters::noXSS($do); ?>.add_category" />
+          <input type="hidden" name="area" value="<?php echo Filters::noXSS(Req::val('area')); ?>" />
+          <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+          <button type="submit"><?php echo Filters::noXSS(L('addnew')); ?></button>
+        </td>
+      </tr>
+    </table>
+  </form>
diff --git a/templates/common.datepicker.tpl b/templates/common.datepicker.tpl
new file mode 100644
index 0000000..561383d
--- /dev/null
+++ b/templates/common.datepicker.tpl
@@ -0,0 +1,9 @@
+<?php if ($label): ?>
+<label for="<?php echo Filters::noXSS($name); ?>"><?php echo Filters::noXSS($label); ?></label>
+<?php endif; ?>
+<input id="<?php echo Filters::noXSS($name); ?>" type="text" class="text" size="10" name="<?php echo Filters::noXSS($name); ?>" value="<?php echo Filters::noXSS($date); ?>" />
+
+<a class="datelink" href="#" id="<?php echo Filters::noXSS($name); ?>dateview">
+  <!--<img src="<?php echo Filters::noXSS($this->get_image('x-office-calendar')); ?>" alt="<?php echo Filters::noXSS(L('selectdate')); ?>" />-->
+</a>
+<script type="text/javascript">Calendar.setup({daFormat: '<?php echo Filters::noJsXSS($dateformat); ?>',inputField: "<?php echo Filters::noXSS($name); ?>", button: "<?php echo Filters::noXSS($name); ?>dateview"});</script>
\ No newline at end of file
diff --git a/templates/common.dualselect.tpl b/templates/common.dualselect.tpl
new file mode 100644
index 0000000..ef87789
--- /dev/null
+++ b/templates/common.dualselect.tpl
@@ -0,0 +1,25 @@
+    <div class="double_select">
+      
+      <select class="dualselect_selectable" id="l<?php echo Filters::noXSS($id); ?>" multiple="multiple"
+        ondblclick="dualSelect(this, 'r', '<?php echo Filters::noJsXSS($id); ?>')">%s</select>
+      
+      <div class="dualselect_buttons">
+        <button type="button" onmouseup="dualSelect('l', 'r', '<?php echo Filters::noJsXSS($id); ?>')">
+          add &#8594;
+        </button>
+        <button type="button" onmouseup="dualSelect('r', 'l', '<?php echo Filters::noJsXSS($id); ?>')">
+           &#8592; del
+        </button>
+      </div>
+      
+      <div class="dualselect_selected">
+        <?php if($updown): ?><button type="button" onmouseup="selectMove('<?php echo Filters::noJsXSS($id); ?>', -1)">&#8593;</button><br /><?php endif; ?>
+
+        <select id="r<?php echo Filters::noXSS($id); ?>" multiple="multiple"
+          ondblclick="dualSelect(this, 'l', '<?php echo Filters::noJsXSS($id); ?>')">%s</select>
+        <?php if($updown): ?><button type="button" onmouseup="selectMove('<?php echo Filters::noJsXSS($id); ?>', 1)">&#8595;</button><?php endif; ?>
+        
+        <input type="hidden" value="<?php echo Filters::noXSS(join(' ', $selected)); ?>" id="v<?php echo Filters::noXSS($id); ?>" name="<?php echo Filters::noXSS($name); ?>" />
+      </div>
+      <div class="clear"></div>
+    </div>
\ No newline at end of file
diff --git a/templates/common.editallusers.tpl b/templates/common.editallusers.tpl
new file mode 100644
index 0000000..97d518c
--- /dev/null
+++ b/templates/common.editallusers.tpl
@@ -0,0 +1,89 @@
+<form action="<?php if ($do == 'admin'): ?><?php echo Filters::noXSS(CreateURL($do, 'editallusers')); ?><?php else: ?><?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?><?php endif; ?>" method="post" id="editallusers">
+  <ul class="form_elements">
+    <li class="required">
+      <?php if ($do == 'admin'): ?>
+        <input type="hidden" name="action" value="admin.editallusers" />
+        <input type="hidden" name="do" value="admin" />
+        <input type="hidden" name="area" value="editallusers" />
+      <?php endif; ?>
+    </li>
+
+	<table class="bulkedituser">
+		<tr class="account_header">
+		        <td><label for=""></label></td>
+		        <td><label for="realname"><b><?php echo Filters::noXSS(L('realname')); ?></b></label></td>
+        		<td><label for="username"><b><?php echo Filters::noXSS(L('username')); ?></b></label></td>
+		        <td><label for="emailaddress"><b><?php echo Filters::noXSS(L('emailaddress')); ?></b></label></td>
+		</tr>
+	<?php
+		/* FIXME: each TR should have an onclick that selects/deselects the checkbox for that user */
+		foreach (Flyspray::ListUsers() as $usr)
+		{ 
+			if ( $usr['account_enabled'] )
+			{
+				echo '<tr class="account_enabled">';
+			}
+			else
+			{
+				echo '<tr class="account_disabled">';
+			}
+        ?>
+
+
+		        <td><input type="checkbox" name="checkedUsers[]" value="<?php echo $usr['user_id']; ?>"></td>
+		        <td><a href="<?php echo CreateURL('edituser', $usr['user_id'] ); ?>"><?php echo $usr['real_name']; ?></a></td>
+		        <td><?php echo $usr['user_name']; ?></td>
+		        <td><?php echo $usr['email_address']; ?></td>
+		</tr>
+
+	<?php
+		}
+	?>
+
+    <br />
+
+    </table>
+
+    <br />
+
+    <button type="submit" id="buSubmit" name="enable"><?php echo Filters::noXSS(L('enableaccounts')); ?></button>
+    <button type="submit" id="buSubmit" name="disable"><?php echo Filters::noXSS(L('disableaccounts')); ?></button>
+    <button type="submit" id="buSubmit" name="delete"><?php echo Filters::noXSS(L('deleteaccounts')); ?></button>
+
+<!-- FIXME: Should still add these to bulk edit, but hasn't been done yet
+    <li>
+      <label for="notify_type"><?php echo Filters::noXSS(L('notifications')); ?></label>
+      <select id="notify_type" name="notify_type">
+        <?php echo tpl_options($fs->GetNotificationOptions(), Req::val('notify_type')); ?>
+
+      </select>
+    </li>
+
+    <li>
+      <label for="time_zone"><?php echo Filters::noXSS(L('timezone')); ?></label>
+      <select id="time_zone" name="time_zone">
+        <?php
+          $times = array();
+          for ($i = -12; $i <= 13; $i++) {
+            $times[$i] = L('GMT') . (($i == 0) ? ' ' : (($i > 0) ? '+' . $i : $i));
+          }
+        ?>
+        <?php echo tpl_options($times, Req::val('time_zone', 0)); ?>
+
+      </select>
+    </li>
+
+    <?php if (isset($groups)): ?>
+    <li>
+      <label for="groupin"><?php echo Filters::noXSS(L('globalgroup')); ?></label>
+      <select id="groupin" class="adminlist" name="group_in">
+        <?php echo tpl_options($groups, Req::val('group_in')); ?>
+
+      </select>
+    </li>
+    <?php endif; ?>
+
+  </ul>
+  <p><button type="submit" id="buSubmit"><?php echo Filters::noXSS(L('Update Accounts')); ?></button></p>
+-->
+</form>
diff --git a/templates/common.editattachments.tpl b/templates/common.editattachments.tpl
new file mode 100644
index 0000000..0a293e9
--- /dev/null
+++ b/templates/common.editattachments.tpl
@@ -0,0 +1,46 @@
+    <?php if ($attachments): ?>
+    <table class="attachments">
+      <thead><tr><th><?php echo Filters::noXSS(L('file')); ?></th><th><?php echo Filters::noXSS(L('size')); ?></th><th><?php echo Filters::noXSS(L('delete')); ?></th></tr></thead>
+      <?php foreach ($attachments as $attachment): ?>
+      <tr>
+        <td>
+          <?php if (file_exists(BASEDIR . '/attachments/' . $attachment['file_name'])): ?>
+          <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?getfile=<?php echo Filters::noXSS($attachment['attachment_id']); ?>" title="<?php echo Filters::noXSS($attachment['file_type']); ?>">
+          <?php else: ?>
+          <del>
+          <?php endif; ?>
+          <?php
+          // Strip the mimetype to get the icon image name
+          list($main) = explode('/', $attachment['file_type']);
+          $imgdir = BASEDIR . "/themes/<?php echo Filters::noXSS($proj->prefs['theme_style']); ?>/mime/";
+          $imgpath = "<?php echo Filters::noXSS($baseurl); ?>themes/<?php echo Filters::noXSS($proj->prefs['theme_style']); ?>/mime/";
+          if (file_exists($imgdir.$attachment['file_type'] . '.png')):
+          ?>
+          <img src="<?php echo Filters::noXSS($imgpath); ?><?php echo Filters::noXSS($attachment['file_type']); ?>.png" alt="(<?php echo Filters::noXSS($attachment['file_type']); ?>)" title="<?php echo Filters::noXSS($attachment['file_type']); ?>" />
+          <?php else: ?>
+          <img src="<?php echo Filters::noXSS($imgpath); ?><?php echo Filters::noXSS($main); ?>.png" alt="" title="<?php echo Filters::noXSS($attachment['file_type']); ?>" />
+          <?php endif; ?>
+          &nbsp;&nbsp;<?php echo Filters::noXSS($attachment['orig_name']); ?>
+
+          <?php if (file_exists(BASEDIR . '/attachments/' . $attachment['file_name'])): ?>
+          </a>
+          <?php else: ?>
+          </del>
+          <?php endif; ?>
+        </td>
+        <td>
+          <?php if ($attachment['file_size'] < 1000000): ?>
+          <?php echo Filters::noXSS(round($attachment['file_size']/1024,1)); ?> <?php echo Filters::noXSS(L('KiB')); ?>
+
+          <?php else: ?>
+          <?php echo Filters::noXSS(round($attachment['file_size']/1024/1024,2)); ?> <?php echo Filters::noXSS(L('MiB')); ?>
+
+          <?php endif; ?>
+        </td>
+        <td>
+          <input type="checkbox" <?php echo tpl_disableif(!$user->perms('delete_attachments')); ?> name="delete_att[]" value="<?php echo Filters::noXSS($attachment['attachment_id']); ?>" />
+        </td>
+      </tr>
+      <?php endforeach; ?>
+    </table>
+    <?php endif; ?>
diff --git a/templates/common.editgroup.tpl b/templates/common.editgroup.tpl
new file mode 100644
index 0000000..7648aca
--- /dev/null
+++ b/templates/common.editgroup.tpl
@@ -0,0 +1,213 @@
+<fieldset class="box"> <legend><?php echo Filters::noXSS(L('editgroup')); ?></legend>
+    <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+        <div>
+            <label for="selectgroup"><?php echo Filters::noXSS(L('editgroup')); ?></label>
+            <select name="id" id="selectgroup"><?php echo tpl_options(Flyspray::ListGroups($proj->id), Req::num('id')); ?></select>
+            <button type="submit"><?php echo Filters::noXSS(L('edit')); ?></button>
+            <input type="hidden" name="do" value="<?php echo Filters::noXSS(Req::val('do')); ?>" />
+            <input type="hidden" name="area" value="editgroup" />
+        </div>
+    </form>
+    <hr />
+  <form action="<?php echo Filters::noXSS(CreateURL('editgroup', Req::num('id'), $do)); ?>" method="post">
+    <table class="box">
+      <tr>
+        <td>
+          <label for="groupname"><?php echo Filters::noXSS(L('groupname')); ?></label>
+        </td>
+        <td><input id="groupname" class="text" type="text" name="group_name" size="20" maxlength="20" value="<?php echo Filters::noXSS(Req::val('group_name', $group_details['group_name'])); ?>" /></td>
+      </tr>
+      <tr>
+        <td><label for="groupdesc"><?php echo Filters::noXSS(L('description')); ?></label></td>
+        <td><input id="groupdesc" class="text" type="text" name="group_desc" size="50" maxlength="100" value="<?php echo Filters::noXSS(Req::val('group_desc', $group_details['group_desc'])); ?>" /></td>
+      </tr>
+      <?php if ($group_details['group_id'] == 1): ?>
+      <tr>
+        <td colspan="2"><?php echo Filters::noXSS(L('notshownforadmin')); ?></td>
+      </tr>
+      <?php else: ?>
+      <tr>
+        <td><label for="projectmanager"><?php echo Filters::noXSS(L('projectmanager')); ?></label></td>
+        <td><?php echo tpl_checkbox('manage_project', Req::val('manage_project', !Req::val('action') && $group_details['manage_project']), 'projectmanager'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="viewtasks"><?php echo Filters::noXSS(L('viewtasks')); ?></label></td>
+        <td><?php echo tpl_checkbox('view_tasks', Req::val('view_tasks', !Req::val('action') && $group_details['view_tasks']), 'viewtasks'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="canopenjobs"><?php echo Filters::noXSS(L('opennewtasks')); ?></label></td>
+        <td><?php echo tpl_checkbox('open_new_tasks', Req::val('open_new_tasks', !Req::val('action') && $group_details['open_new_tasks']), 'canopenjobs'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="modifyowntasks"><?php echo Filters::noXSS(L('modifyowntasks')); ?></label></td>
+        <td><?php echo tpl_checkbox('modify_own_tasks', Req::val('modify_own_tasks', !Req::val('action') && $group_details['modify_own_tasks']), 'modifyowntasks'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="modifyalltasks"><?php echo Filters::noXSS(L('modifyalltasks')); ?></label></td>
+        <td><?php echo tpl_checkbox('modify_all_tasks', Req::val('modify_all_tasks', !Req::val('action') && $group_details['modify_all_tasks']), 'modifyalltasks'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="viewcomments"><?php echo Filters::noXSS(L('viewcomments')); ?></label></td>
+        <td><?php echo tpl_checkbox('view_comments', Req::val('view_comments', !Req::val('action') && $group_details['view_comments']), 'viewcomments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="canaddcomments"><?php echo Filters::noXSS(L('addcomments')); ?></label></td>
+        <td><?php echo tpl_checkbox('add_comments', Req::val('add_comments', !Req::val('action') && $group_details['add_comments']), 'canaddcomments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="editowncomments"><?php echo Filters::noXSS(L('editowncomments')); ?></label></td>
+        <td><?php echo tpl_checkbox('edit_own_comments', Req::val('edit_own_comments', !Req::val('action') && $group_details['edit_own_comments']), 'editowncomments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="editcomments"><?php echo Filters::noXSS(L('editcomments')); ?></label></td>
+        <td><?php echo tpl_checkbox('edit_comments', Req::val('edit_comments', !Req::val('action') && $group_details['edit_comments']), 'editcomments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="deletecomments"><?php echo Filters::noXSS(L('deletecomments')); ?></label></td>
+        <td><?php echo tpl_checkbox('delete_comments', Req::val('delete_comments', !Req::val('action') && $group_details['delete_comments']), 'deletecomments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="createattachments"><?php echo Filters::noXSS(L('createattachments')); ?></label></td>
+        <td><?php echo tpl_checkbox('create_attachments', Req::val('create_attachments', !Req::val('action') && $group_details['create_attachments']), 'createattachments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="deleteattachments"><?php echo Filters::noXSS(L('deleteattachments')); ?></label></td>
+        <td><?php echo tpl_checkbox('delete_attachments', Req::val('delete_attachments', !Req::val('action') && $group_details['delete_attachments']), 'deleteattachments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="viewhistory"><?php echo Filters::noXSS(L('viewhistory')); ?></label></td>
+        <td><?php echo tpl_checkbox('view_history', Req::val('view_history', !Req::val('action') && $group_details['view_history']), 'viewhistory'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="closeowntasks"><?php echo Filters::noXSS(L('closeowntasks')); ?></label></td>
+        <td><?php echo tpl_checkbox('close_own_tasks', Req::val('close_own_tasks', !Req::val('action') && $group_details['close_own_tasks']), 'closeowntasks'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="closeothertasks"><?php echo Filters::noXSS(L('closeothertasks')); ?></label></td>
+        <td><?php echo tpl_checkbox('close_other_tasks', Req::val('close_other_tasks', !Req::val('action') && $group_details['close_other_tasks']), 'closeothertasks'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="assigntoself"><?php echo Filters::noXSS(L('assigntoself')); ?></label></td>
+        <td><?php echo tpl_checkbox('assign_to_self', Req::val('assign_to_self', !Req::val('action') && $group_details['assign_to_self']), 'assigntoself'); ?></td>
+      </tr>
+       <tr>
+        <td><label for="assignotherstoself"><?php echo Filters::noXSS(L('assignotherstoself')); ?></label></td>
+        <td><?php echo tpl_checkbox('assign_others_to_self', Req::val('assign_others_to_self', !Req::val('action') && $group_details['assign_others_to_self']), 'assignotherstoself'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="addtoassignees"><?php echo Filters::noXSS(L('addtoassignees')); ?></label></td>
+        <td><?php echo tpl_checkbox('add_to_assignees', Req::val('add_to_assignees', !Req::val('action') && $group_details['add_to_assignees']), 'addtoassignees'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="viewreports"><?php echo Filters::noXSS(L('viewreports')); ?></label></td>
+        <td><?php echo tpl_checkbox('view_reports', Req::val('view_reports', !Req::val('action') && $group_details['view_reports']), 'viewreports'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="canvote"><?php echo Filters::noXSS(L('canvote')); ?></label></td>
+        <td><?php echo tpl_checkbox('add_votes', Req::val('add_votes', !Req::val('action') && $group_details['add_votes']), 'canvote'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="editassignments"><?php echo Filters::noXSS(L('editassignments')); ?></label></td>
+        <td><?php echo tpl_checkbox('edit_assignments', Req::val('edit_assignments', !Req::val('action') && $group_details['edit_assignments']), 'editassignments'); ?></td>
+      </tr>
+      <tr>
+        <td><label for="show_as_assignees"><?php echo Filters::noXSS(L('showasassignees')); ?></label></td>
+        <td><?php echo tpl_checkbox('show_as_assignees', Req::val('show_as_assignees', !Req::val('action') && $group_details['show_as_assignees']), 'show_as_assignees'); ?></td>
+      </tr>
+        <tr>
+            <td><label for="vieweffort"><?php echo Filters::noXSS(L('vieweffort')); ?></label></td>
+            <td><?php echo tpl_checkbox('view_effort', Req::val('view_effort', !Req::val('action') && $group_details['view_effort']), 'vieweffort'); ?></td>
+        </tr>
+        <tr>
+            <td><label for="trackeffort"><?php echo Filters::noXSS(L('trackeffort')); ?></label></td>
+            <td><?php echo tpl_checkbox('track_effort', Req::val('track_effort', !Req::val('action') && $group_details['track_effort']), 'trackeffort'); ?></td>
+        </tr>
+
+      <?php if (!$proj->id): ?>
+      <tr>
+        <td><label for="groupopen"><?php echo Filters::noXSS(L('groupenabled')); ?></label></td>
+        <td><?php echo tpl_checkbox('group_open', Req::val('group_open', !Req::val('action') && $group_details['group_open']), 'groupopen'); ?></td>
+      </tr>
+      <?php endif; ?>
+      <?php endif; ?>
+      <?php if ($group_details['group_id'] != '1'): ?>
+      <tr>
+        <td><label><input type="checkbox" name="delete_group" /> <?php echo Filters::noXSS(L('deletegroup')); ?></label></td>
+        <td><select name="move_to">
+              <?php echo tpl_options( array_merge( ($proj->id) ? array(L('nogroup')) : array(), Flyspray::listGroups($proj->id)), null, false, null, $group_details['group_id']); ?>
+
+            </select>
+        </td>
+      </tr>
+      <?php endif; ?>
+      <tr>
+        <td><label for="add_user"><?php echo Filters::noXSS(L('addusergroup')); ?></label></td>
+        <td>
+            <?php echo tpl_userselect('uid', '', 'add_user'); ?>
+
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" class="buttons">
+          <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+          <input type="hidden" name="action" value="<?php echo Filters::noXSS(Req::val('action', $do . '.editgroup')); ?>" />
+          <input type="hidden" name="area" value="editgroup" />
+          <input type="hidden" name="group_id" value="<?php echo Filters::noXSS($group_details['group_id']); ?>" />
+          <button type="submit"><?php echo Filters::noXSS(L('updatedetails')); ?></button>
+        </td>
+      </tr>
+    </table>
+  </form>
+
+  <hr />
+
+  <form action="<?php echo Filters::noXSS(CreateURL('editgroup', Req::num('id'), $do)); ?>" method="post">
+   <div>
+    <h3><?php echo Filters::noXSS(L('groupmembers')); ?></h3>
+    <table id="manage_users_in_groups" class="userlist">
+    <tr>
+      <th>
+        <a href="javascript:ToggleSelected('manage_users_in_groups')">
+          <img title="<?php echo Filters::noXSS(L('toggleselected')); ?>" alt="<?php echo Filters::noXSS(L('toggleselected')); ?>" src="<?php echo Filters::noXSS($this->get_image('kaboodleloop')); ?>" width="16" height="16" />
+        </a>
+      </th>
+      <th><?php echo Filters::noXSS(L('username')); ?></th>
+      <th><?php echo Filters::noXSS(L('realname')); ?></th>
+      <th><?php echo Filters::noXSS(L('accountenabled')); ?></th>
+    </tr>
+    <?php
+    foreach($proj->listUsersIn($group_details['group_id']) as $usr): ?>
+    <tr>
+      <td class="ttcolumn"><?php echo tpl_checkbox('users['.$usr['user_id'].']'); ?></td>
+      <td><a href="<?php echo Filters::noXSS(CreateURL('edituser', $usr['user_id'])); ?>"><?php echo Filters::noXSS($usr['user_name']); ?></a></td>
+      <td><?php echo Filters::noXSS($usr['real_name']); ?></td>
+      <?php if ($usr['account_enabled']) : ?>
+      <td class="imgcol"><img src="<?php echo Filters::noXSS($this->get_image('button_ok')); ?>" alt="<?php echo Filters::noXSS(L('yes')); ?>" /></td>
+      <?php else: ?>
+      <td class="imgcol"><img src="<?php echo Filters::noXSS($this->get_image('button_cancel')); ?>" alt="<?php echo Filters::noXSS(L('no')); ?>" /></td>
+      <?php endif; ?>
+    </tr>
+    <?php
+    $users_in[] = $usr['user_id'];
+    endforeach;
+    ?>
+
+    <tr>
+      <td colspan="4">
+        <button type="submit"><?php echo Filters::noXSS(L('moveuserstogroup')); ?></button>
+        <select class="adminlist" name="switch_to_group">
+          <?php if ($proj->id): ?>
+          <option value="0"><?php echo Filters::noXSS(L('nogroup')); ?></option>
+          <?php endif; ?>
+          <?php echo tpl_options(Flyspray::listGroups($proj->id), null, false, null, $group_details['group_id']); ?>
+
+        </select>
+      </td>
+    </tr>
+  </table>
+  <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+  <input type="hidden" name="action" value="movetogroup" />
+  <input type="hidden" name="old_group" value="<?php echo Filters::noXSS($group_details['group_id']); ?>" />
+  </div>
+ </form>
+</fieldset>
diff --git a/templates/common.editlinks.tpl b/templates/common.editlinks.tpl
new file mode 100644
index 0000000..31f7e00
--- /dev/null
+++ b/templates/common.editlinks.tpl
@@ -0,0 +1,15 @@
+<?php if($links): ?>
+    <table class="links">
+     <thread><tr><th><?php echo Filters::noXSS(L('link')); ?></th><th><?php echo Filters::noXSS(L('delete')); ?></th></tr></thread>
+      <?php foreach ($links as $link): ?>
+       <tr>
+        <td>
+         <a href="<?php echo $link['url']; ?>"><?php echo $link['url']; ?></a>
+        </td>
+        <td>
+         <input type="checkbox" <?php echo Filters::noXSS(tpl_disableif(!$user->perms('delete_attachments'))); ?> name="delete_link[]" value="<?php echo $link['link_id']; ?>" />
+        </td>
+       </tr>
+      <?php endforeach; ?>
+     </table>
+<?php endif; ?>
diff --git a/templates/common.links.tpl b/templates/common.links.tpl
new file mode 100644
index 0000000..9f2e9fb
--- /dev/null
+++ b/templates/common.links.tpl
@@ -0,0 +1,10 @@
+<?php if ($links && $user->can_view_task($task_details)): ?>
+  <div class="links">
+   <?php echo Filters::noXSS(L('referencelinks')); ?><br>
+   <?php foreach ($links as $link): ?>
+    <a href="<?php echo $link['url']; ?>"><?php echo $link['url']; ?></a><br>
+   <?php endforeach; ?>
+  </div>
+<?php elseif (count($links)): ?>
+  <div class="links"><?php echo Filters::noXSS(L('linknoperms')); ?></div>
+<?php endif; ?>
diff --git a/templates/common.list.tpl b/templates/common.list.tpl
new file mode 100644
index 0000000..c42b30d
--- /dev/null
+++ b/templates/common.list.tpl
@@ -0,0 +1,125 @@
+<p><?php echo Filters::noXSS(L('listnote')); ?></p>
+<?php if (count($rows)): ?>
+<div id="controlBox">
+    <div class="grip"></div>
+    <div class="inner">
+        <a href="#" onclick="TableControl.up('listTable'); return false;"><img src="<?php echo Filters::noXSS($this->themeUrl()); ?>/up.png" alt="Up" /></a>
+        <a href="#" onclick="TableControl.down('listTable'); return false;"><img src="<?php echo Filters::noXSS($this->themeUrl()); ?>/down.png" alt="Down" /></a>
+    </div>
+</div>
+<?php endif; ?>
+<form action="<?php echo Filters::noXSS(CreateURL($do, $list_type, $proj->id)); ?>" method="post">
+  <table class="list" id="listTable">
+   <thead>
+     <tr>
+       <th><?php echo Filters::noXSS(L('name')); ?></th>
+       <th><?php echo Filters::noXSS(L('order')); ?></th>
+       <th><?php echo Filters::noXSS(L('show')); ?></th>
+       <?php if ($list_type == 'version'): ?><th><?php echo Filters::noXSS(L('tense')); ?></th><?php endif; ?>
+       <th><?php echo Filters::noXSS(L('delete')); ?></th>
+     </tr>
+   </thead>
+   <tbody>
+    <?php
+    $countlines = -1;
+    foreach ($rows as $row):
+    $countlines++; ?>
+    <tr>
+      <td class="first">
+        <input id="listname<?php echo Filters::noXSS($countlines); ?>" class="text" type="text" size="15" maxlength="40" name="list_name[<?php echo Filters::noXSS($row[$list_type.'_id']); ?>]"
+          value="<?php echo Filters::noXSS($row[$list_type.'_name']); ?>" />
+      </td>
+      <td title="<?php echo Filters::noXSS(L('ordertip')); ?>">
+        <input id="listposition<?php echo Filters::noXSS($countlines); ?>" class="text" type="text" size="3" maxlength="3" name="list_position[<?php echo Filters::noXSS($row[$list_type.'_id']); ?>]" value="<?php echo Filters::noXSS($row['list_position']); ?>" />
+      </td>
+      <td title="<?php echo Filters::noXSS(L('showtip')); ?>">
+        <?php echo tpl_checkbox('show_in_list[' . $row[$list_type.'_id'] . ']', $row['show_in_list'], 'showinlist'.$countlines); ?>
+
+      </td>
+      <?php if ($list_type == 'version'): ?>
+      <td title="<?php echo Filters::noXSS(L('listtensetip')); ?>">
+        <select id="tense<?php echo Filters::noXSS($countlines); ?>" name="<?php echo Filters::noXSS($list_type); ?>_tense[<?php echo Filters::noXSS($row[$list_type.'_id']); ?>]">
+          <?php echo tpl_options(array(1=>L('past'), 2=>L('present'), 3=>L('future')), $row[$list_type.'_tense']); ?>
+
+        </select>
+      </td>
+      <?php endif; ?>
+      <td title="<?php echo Filters::noXSS(L('deletetip')); ?>">
+        <input id="delete<?php echo Filters::noXSS($row[$list_type.'_id']); ?>" type="checkbox"
+        <?php if ($row['used_in_tasks'] || ($list_type == 'status' && $row[$list_type.'_id'] < 7) || ($list_type == 'resolution' && $row[$list_type.'_id'] == 6)): ?>
+        disabled="disabled"
+        <?php endif; ?>
+        name="delete[<?php echo Filters::noXSS($row[$list_type.'_id']); ?>]" value="1" />
+      </td>
+    </tr>
+    <?php endforeach; ?>
+    </tbody>
+    <?php if(count($rows)): ?>
+    <tr>
+      <td colspan="3"></td>
+      <td class="buttons">
+        <?php if ($list_type == 'version'): ?>
+        <input type="hidden" name="action" value="update_version_list" />
+        <?php else: ?>
+        <input type="hidden" name="action" value="update_list" />
+        <?php endif; ?>
+        <input type="hidden" name="list_type" value="<?php echo Filters::noXSS($list_type); ?>" />
+        <input type="hidden" name="project" value="<?php echo Filters::noXSS($proj->id); ?>" />
+        <button type="submit"><?php echo Filters::noXSS(L('update')); ?></button>
+      </td>
+    </tr>
+    <?php endif; ?>
+  </table>
+  <?php if (count($rows)): ?>
+  <script type="text/javascript">
+        <?php
+            echo 'TableControl.create("listTable",{
+                controlBox: "controlBox",
+                tree: false
+            });';
+            echo 'new Draggable("controlBox",{
+                handle: "grip"
+            });';
+        ?>
+  </script>
+  <?php endif; ?>
+</form>
+<hr />
+<form action="<?php echo Filters::noXSS(CreateURL($do, $list_type, $proj->id)); ?>" method="post">
+  <table class="list">
+    <tr>
+      <td>
+        <?php if ($list_type == 'version'): ?>
+        <input type="hidden" name="action" value="<?php echo Filters::noXSS($do); ?>.add_to_version_list" />
+        <?php else: ?>
+        <input type="hidden" name="action" value="<?php echo Filters::noXSS($do); ?>.add_to_list" />
+        <?php endif; ?>
+        <input type="hidden" name="list_type" value="<?php echo Filters::noXSS($list_type); ?>" />
+        <?php if ($proj->id): ?>
+        <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+        <?php endif; ?>
+        <input type="hidden" name="area" value="<?php echo Filters::noXSS(Req::val('area')); ?>" />
+        <input type="hidden" name="do" value="<?php echo Filters::noXSS(Req::val('do')); ?>" />
+        <input id="listnamenew" class="text" type="text" size="15" maxlength="40" value="<?php echo Filters::noXSS(Req::val('list_name')); ?>" name="list_name" />
+      </td>
+      <td>
+        <input id="listpositionnew" class="text" type="text" size="3" maxlength="3" value="<?php echo Filters::noXSS(Req::val('list_position')); ?>" name="list_position" />
+      </td>
+      <td>
+        <input id="showinlistnew" type="checkbox" name="show_in_list" checked="checked" disabled="disabled" />
+      </td>
+      <?php if ($list_type == 'version'): ?>
+      <td title="<?php echo Filters::noXSS(L('listtensetip')); ?>">
+        <select id="tensenew" name="<?php echo Filters::noXSS($list_type); ?>_tense">
+          <?php echo tpl_options(array(1=>L('past'), 2=>L('present'), 3=>L('future')), 2); ?>
+
+        </select>
+      </td>
+      <?php endif; ?>
+      <td class="buttons">
+        <input type="hidden" name="project" value="<?php echo Filters::noXSS($proj->id); ?>" />
+        <button type="submit"><?php echo Filters::noXSS(L('addnew')); ?></button>
+      </td>
+    </tr>
+  </table>
+</form>
diff --git a/templates/common.multiuserselect.tpl b/templates/common.multiuserselect.tpl
new file mode 100644
index 0000000..84da879
--- /dev/null
+++ b/templates/common.multiuserselect.tpl
@@ -0,0 +1,51 @@
+               <div class="userSelectWidget">
+                   <label for="find_user" class="inline" style="margin:0;padding:0;"><?php echo Filters::noXSS(L('find')); ?>:</label>
+                   <input type="text" class="text" value="<?php echo Filters::noXSS(Post::val('find_user')); ?>" name="find_user" id="find_user" onkeyup="return entercheck(event)" />
+                   <a href="javascript:unselectAll()"><?php echo Filters::noXSS(L('noone')); ?></a>
+                   <br />
+
+                   <select size="8" style="width:200px;" name="rassigned_to[]" id="rassigned_to" multiple="multiple">
+                     <?php foreach ($userlist as $group => $users): ?>
+                        <optgroup label="<?php echo Filters::noXSS($group); ?>">
+                        <?php foreach ($users as $info): ?>
+                        <option value="<?php echo Filters::noXSS($info[0]); ?>" <?php if (in_array($info[0], $assignees)): ?>selected="selected"<?php endif; ?>><?php echo Filters::noXSS($info[1]); ?></option>
+                        <?php endforeach; ?>
+                        </optgroup>
+                     <?php endforeach; ?>
+                   </select>
+							 </div>
+                <script type="text/javascript">
+                resetOption = null;
+                function entercheck(e)
+                {
+                    // Find user and select it
+                    if ($('find_user').value.length < 1) {
+                        if (resetOption != null) {
+                            resetOption.selected = false;
+                        }
+                    } else {
+                        var options = $('rassigned_to').options;
+                        for (var i = 0; i < options.length; i++) {
+                            if (options[i].text.toLowerCase().indexOf($('find_user').value.toLowerCase()) >= 0) {
+                                if (resetOption != null) {
+                                    resetOption.selected = false;
+                                }
+                                if (options[i].selected == false) {
+                                    resetOption = options[i];
+                                }
+                                options[i].selected=false; // focus
+                                options[i].selected=true;
+                                return true;
+                            }
+                        }
+                    }
+                }
+                
+                function unselectAll()
+				{
+					var options = $('rassigned_to').options;
+                    for (var i = 0; i < options.length; i++) {
+						options[i].selected=false;
+					}
+				}
+                </script>
\ No newline at end of file
diff --git a/templates/common.newgroup.tpl b/templates/common.newgroup.tpl
new file mode 100644
index 0000000..81da3bc
--- /dev/null
+++ b/templates/common.newgroup.tpl
@@ -0,0 +1,161 @@
+<form action="<?php echo Filters::noXSS(CreateUrl($do, 'newgroup', $proj->id)); ?>" method="post" id="newgroup">
+    
+    <ul class="form_elements">
+      <li class="required">
+        <label for="groupname"><?php echo Filters::noXSS(L('groupname')); ?> *</label>
+        <input id="groupname" class="required text" type="text" value="<?php echo Filters::noXSS(Req::val('group_name')); ?>" name="group_name" size="20" maxlength="20" />
+      </li>   
+      
+      <li>   
+        <label for="groupdesc"><?php echo Filters::noXSS(L('description')); ?></label>
+        <input id="groupdesc" class="text" type="text" value="<?php echo Filters::noXSS(Req::val('group_desc')); ?>" name="group_desc" size="50" maxlength="100" />
+      </li>   
+      
+      <li>   
+        <label for="manageproject"><?php echo Filters::noXSS(L('projectmanager')); ?></label>
+        <?php echo tpl_checkbox('manage_project', Req::val('manage_project'), 'manageproject'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="viewtasks"><?php echo Filters::noXSS(L('viewtasks')); ?></label>
+        <?php echo tpl_checkbox('view_tasks', Req::val('view_tasks', Req::val('action') != 'newgroup.newgroup'), 'viewtasks'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="opennewtasks"><?php echo Filters::noXSS(L('opennewtasks')); ?></label>
+        <?php echo tpl_checkbox('open_new_tasks', Req::val('open_new_tasks', Req::val('action') != 'newgroup.newgroup'), 'opennewtasks'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="modifyowntasks"><?php echo Filters::noXSS(L('modifyowntasks')); ?></label>
+        <?php echo tpl_checkbox('modify_own_tasks', Req::val('modify_own_tasks'), 'modifyowntasks'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="modifyalltasks"><?php echo Filters::noXSS(L('modifyalltasks')); ?></label>
+        <?php echo tpl_checkbox('modify_all_tasks', Req::val('modify_all_tasks'), 'modifyalltasks'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="viewcomments"><?php echo Filters::noXSS(L('viewcomments')); ?></label>
+        <?php echo tpl_checkbox('view_comments', Req::val('view_comments', Req::val('action') != 'newgroup.newgroup'), 'viewcomments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="addcomments"><?php echo Filters::noXSS(L('addcomments')); ?></label>
+        <?php echo tpl_checkbox('add_comments', Req::val('add_comments'), 'addcomments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="editowncomments"><?php echo Filters::noXSS(L('editowncomments')); ?></label>
+        <?php echo tpl_checkbox('edit_own_comments', Req::val('edit_own_comments'), 'editowncomments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="editcomments"><?php echo Filters::noXSS(L('editcomments')); ?></label>
+        <?php echo tpl_checkbox('edit_comments', Req::val('edit_comments'), 'editcomments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="deletecomments"><?php echo Filters::noXSS(L('deletecomments')); ?></label>
+        <?php echo tpl_checkbox('delete_comments', Req::val('delete_comments'), 'deletecomments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="createattachments"><?php echo Filters::noXSS(L('createattachments')); ?></label>
+        <?php echo tpl_checkbox('create_attachments', Req::val('create_attachments'), 'createattachments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="deleteattachments"><?php echo Filters::noXSS(L('deleteattachments')); ?></label>
+        <?php echo tpl_checkbox('delete_attachments', Req::val('delete_attachments'), 'deleteattachments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="viewhistory"><?php echo Filters::noXSS(L('viewhistory')); ?></label>
+        <?php echo tpl_checkbox('view_history', Req::val('view_history', Req::val('action') != 'newgroup.newgroup'), 'viewhistory'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="closeowntasks"><?php echo Filters::noXSS(L('closeowntasks')); ?></label>
+        <?php echo tpl_checkbox('close_own_tasks', Req::val('close_own_tasks'), 'closeowntasks'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="closeothertasks"><?php echo Filters::noXSS(L('closeothertasks')); ?></label>
+        <?php echo tpl_checkbox('close_other_tasks', Req::val('close_other_tasks'), 'closeothertasks'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="assigntoself"><?php echo Filters::noXSS(L('assigntoself')); ?></label>
+        <?php echo tpl_checkbox('assign_to_self', Req::val('assign_to_self'), 'assigntoself'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="assignotherstoself"><?php echo Filters::noXSS(L('assignotherstoself')); ?></label>
+        <?php echo tpl_checkbox('assign_others_to_self', Req::val('assign_others_to_self'), 'assignotherstoself'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="addtoassignees"><?php echo Filters::noXSS(L('addtoassignees')); ?></label>
+        <?php echo tpl_checkbox('add_to_assignees', Req::val('add_to_assignees'), 'addtoassignees'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="viewreports"><?php echo Filters::noXSS(L('viewreports')); ?></label>
+        <?php echo tpl_checkbox('view_reports', Req::val('view_reports', Req::val('action') != 'newgroup.newgroup'), 'viewreports'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="canvote"><?php echo Filters::noXSS(L('canvote')); ?></label>
+        <?php echo tpl_checkbox('add_votes', Req::val('add_votes', Req::val('action') != 'newgroup.newgroup'), 'canvote'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="editassignments"><?php echo Filters::noXSS(L('editassignments')); ?></label>
+        <?php echo tpl_checkbox('edit_assignments', Req::val('edit_assignments'), 'editassignments'); ?>
+
+      </li>   
+      
+      <li>   
+        <label for="show_as_assignees"><?php echo Filters::noXSS(L('showasassignees')); ?></label>
+        <?php echo tpl_checkbox('show_as_assignees', Req::val('show_as_assignees'), 'show_as_assignees'); ?>
+
+      </li>   
+      
+      <?php if (!$proj->id): ?>
+      
+      <li>   
+        <label for="groupopen"><?php echo Filters::noXSS(L('groupenabled')); ?></label>
+        <?php echo tpl_checkbox('group_open', Req::val('group_open', Req::val('action') != 'newgroup.newgroup'), 'groupopen'); ?>
+
+      </li>   
+      
+      <?php endif; ?>
+    </ul>      
+    
+      <input type="hidden" name="action" value="<?php if ($proj->id): ?>pm<?php else: ?>admin<?php endif; ?>.newgroup" />
+      <input type="hidden" name="project_id" value="<?php echo Filters::noXSS(Req::val('project')); ?>" />
+      <button type="submit"><?php echo Filters::noXSS(L('addthisgroup')); ?></button>
+    
+</form>
diff --git a/templates/common.newuser.tpl b/templates/common.newuser.tpl
new file mode 100644
index 0000000..78f771e
--- /dev/null
+++ b/templates/common.newuser.tpl
@@ -0,0 +1,85 @@
+<form action="<?php if ($do == 'admin'): ?><?php echo Filters::noXSS(CreateURL($do, 'newuser')); ?><?php else: ?><?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?><?php endif; ?>" method="post" enctype="multipart/form-data" id="registernewuser">
+  <ul class="form_elements">
+    <li class="required">
+      <?php if ($do == 'admin'): ?>
+        <input type="hidden" name="action" value="admin.newuser" />
+        <input type="hidden" name="do" value="admin" />
+        <input type="hidden" name="area" value="newuser" />
+      <?php else: ?>
+        <input type="hidden" name="action" value="register.newuser" />
+      <?php endif; ?>
+      <label for="username"><?php echo Filters::noXSS(L('username')); ?>*</label>
+      <input id="username" name="user_name" value="<?php echo Filters::noXSS(Req::val('user_name')); ?>" class="required text" type="text" size="20" maxlength="32" onblur="checkname(this.value);" />
+      <br /><span id="errormessage"></span>
+    </li>
+
+    <?php if (!$fs->prefs['disable_changepw']): ?>
+
+    <li>
+      <label for="userpass"><?php echo Filters::noXSS(L('password')); ?></label>
+      <input id="userpass" class="password" name="user_pass" value="<?php echo Filters::noXSS(Req::val('user_pass')); ?>" type="password" size="20" maxlength="100" /> <em><?php echo Filters::noXSS(L('minpwsize')); ?></em>
+    </li>
+
+    <li>
+      <label for="userpass2"><?php echo Filters::noXSS(L('confirmpass')); ?></label>
+      <input id="userpass2" class="password" name="user_pass2" value="<?php echo Filters::noXSS(Req::val('user_pass2')); ?>" type="password" size="20" maxlength="100" /><br />
+      <span class="note"><?php echo Filters::noXSS(L('leaveemptyauto')); ?></span>
+    </li>
+
+    <?php endif; ?>
+
+    <li class="required">
+      <label for="realname"><?php echo Filters::noXSS(L('realname')); ?>*</label>
+      <input id="realname" name="real_name" class="required text" value="<?php echo Filters::noXSS(Req::val('real_name')); ?>" type="text" size="20" maxlength="100" />
+    </li>
+
+    <li class="required">
+      <label for="emailaddress"><?php echo Filters::noXSS(L('emailaddress')); ?>*</label>
+      <input id="emailaddress" name="email_address" class="text required" value="<?php echo Filters::noXSS(Req::val('email_address')); ?>" type="text" size="20" maxlength="100" /> <em><?php echo Filters::noXSS(L('validemail')); ?></em>
+    </li>
+
+    <li>
+      <label for="jabberid"><?php echo Filters::noXSS(L('jabberid')); ?></label>
+      <input id="jabberid" name="jabber_id" class="text" type="text" value="<?php echo Filters::noXSS(Req::val('jabber_id')); ?>" size="20" maxlength="100" />
+    </li>
+
+    <li>
+      <label for="profileimage"><?php echo Filters::noXSS(L('profileimage')); ?></label>
+      <input id="profileimage" name="profile_image" type="file" value="<?php echo Filters::noXSS(Req::val('profile_image')); ?>"/>
+    </li>
+
+    <li>
+      <label for="notify_type"><?php echo Filters::noXSS(L('notifications')); ?></label>
+      <select id="notify_type" name="notify_type">
+        <?php echo tpl_options($fs->GetNotificationOptions(), Req::val('notify_type')); ?>
+
+      </select>
+    </li>
+
+    <li>
+      <label for="time_zone"><?php echo Filters::noXSS(L('timezone')); ?></label>
+      <select id="time_zone" name="time_zone">
+        <?php
+          $times = array();
+          for ($i = -12; $i <= 13; $i++) {
+            $times[$i] = L('GMT') . (($i == 0) ? ' ' : (($i > 0) ? '+' . $i : $i));
+          }
+        ?>
+        <?php echo tpl_options($times, Req::val('time_zone', 0)); ?>
+
+      </select>
+    </li>
+
+    <?php if (isset($groups)): ?>
+    <li>
+      <label for="groupin"><?php echo Filters::noXSS(L('globalgroup')); ?></label>
+      <select id="groupin" class="adminlist" name="group_in">
+        <?php echo tpl_options($groups, Req::val('group_in')); ?>
+
+      </select>
+    </li>
+    <?php endif; ?>
+
+  </ul>
+  <p><button type="submit" id="buSubmit"><?php echo Filters::noXSS(L('registeraccount')); ?></button></p>
+</form>
diff --git a/templates/common.newuserbulk.tpl b/templates/common.newuserbulk.tpl
new file mode 100644
index 0000000..4e3dcbd
--- /dev/null
+++ b/templates/common.newuserbulk.tpl
@@ -0,0 +1,77 @@
+<form action="<?php if ($do == 'admin'): ?><?php echo Filters::noXSS(CreateURL($do, 'newuserbulk')); ?><?php else: ?><?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?><?php endif; ?>" method="post" id="registernewuser">
+  <ul class="form_elements">
+    <li class="required">
+      <?php if ($do == 'admin'): ?>
+        <input type="hidden" name="action" value="admin.newuserbulk" />
+        <input type="hidden" name="do" value="admin" />
+        <input type="hidden" name="area" value="newuserbulk" />
+      <?php else: ?>
+        <input type="hidden" name="action" value="register.newuserbulk" />
+      <?php endif; ?>
+    </li>
+
+    <!-- Header -->
+    <li>
+      <b><?php echo Filters::noXSS(L('bulkuserstoadd')); ?>:</b>
+    </li>
+    <table class="bulkuser">
+      <tr>
+        <td><label for="realname"><?php echo Filters::noXSS(L('realname')); ?></label></td>
+        <td><label for="username"><?php echo Filters::noXSS(L('username')); ?></label></td>
+        <td><label for="emailaddress"><?php echo Filters::noXSS(L('emailaddress')); ?></label></td>
+      </tr>
+    <br />
+
+
+<?php for ($i = 0 ; $i < 10 ; $i++) { ?>
+    <!-- User <?php echo Filters::noXSS($i); ?> -->
+    <tr>
+      <td><input id="realname" name="real_name<?php echo Filters::noXSS($i); ?>" class="text" value="<?php echo Filters::noXSS(Req::val('real_name')); ?>" type="text" size="20" maxlength="100" onblur="this.form.elements['user_name<?php echo Filters::noXSS($i); ?>'].value = this.form.elements['real_name<?php echo Filters::noXSS($i); ?>'].value.replace(/ /g,'');"/></td>
+      <td><input id="username" name="user_name<?php echo Filters::noXSS($i); ?>" value="<?php echo Filters::noXSS(Req::val('user_name')); ?>" class="text" type="text" size="20" maxlength="32"  onblur="checkname(this.value); "/></td>
+      <td><input id="emailaddress" name="email_address<?php echo Filters::noXSS($i); ?>" class="text" value="<?php echo Filters::noXSS(Req::val('email_address')); ?>" type="text" size="20" maxlength="100" /></td>
+    <tr>
+     <tr></tr>
+<?php } ?>
+    </table>
+
+
+    <br />
+
+    <li>
+      <b><?php echo Filters::noXSS(L('optionsforallusers')); ?>:</b>
+    </li>
+    <li>
+      <label for="notify_type"><?php echo Filters::noXSS(L('notifications')); ?></label>
+      <select id="notify_type" name="notify_type">
+        <?php echo tpl_options($fs->GetNotificationOptions(), Req::val('notify_type')); ?>
+
+      </select>
+    </li>
+
+    <li>
+      <label for="time_zone"><?php echo Filters::noXSS(L('timezone')); ?></label>
+      <select id="time_zone" name="time_zone">
+        <?php
+          $times = array();
+          for ($i = -12; $i <= 13; $i++) {
+            $times[$i] = L('GMT') . (($i == 0) ? ' ' : (($i > 0) ? '+' . $i : $i));
+          }
+        ?>
+        <?php echo tpl_options($times, Req::val('time_zone', 0)); ?>
+
+      </select>
+    </li>
+
+    <?php if (isset($groups)): ?>
+    <li>
+      <label for="groupin"><?php echo Filters::noXSS(L('globalgroup')); ?></label>
+      <select id="groupin" class="adminlist" name="group_in">
+        <?php echo tpl_options($groups, Req::val('group_in')); ?>
+
+      </select>
+    </li>
+    <?php endif; ?>
+
+  </ul>
+  <p><button type="submit" id="buSubmit"><?php echo Filters::noXSS(L('registerbulkaccount')); ?></button></p>
+</form>
diff --git a/templates/common.profile.tpl b/templates/common.profile.tpl
new file mode 100644
index 0000000..7b8c319
--- /dev/null
+++ b/templates/common.profile.tpl
@@ -0,0 +1,151 @@
+  <form action="<?php if ($do == 'myprofile'): ?><?php echo Filters::noXSS(CreateUrl('myprofile')); ?><?php else: ?><?php echo Filters::noXSS(CreateUrl('edituser', $theuser->id)); ?><?php endif; ?>" method="post" enctype="multipart/form-data">
+    <ul class="form_elements">
+      <li>
+        <label for="realname"><?php echo Filters::noXSS(L('realname')); ?></label>
+        <input id="realname" class="text" type="text" name="real_name" size="50" maxlength="100"
+          value="<?php echo Filters::noXSS(Req::val('real_name', $theuser->infos['real_name'])); ?>" />
+      </li>
+      
+      <li>
+        <label for="emailaddress"><?php echo Filters::noXSS(L('emailaddress')); ?></label>
+        <input id="emailaddress" class="text" type="text" name="email_address" size="50" maxlength="100"
+          value="<?php echo Filters::noXSS(Req::val('email_address', $theuser->infos['email_address'])); ?>" />
+      </li>
+      
+      <li>
+        <label for="jabberid"><?php echo Filters::noXSS(L('jabberid')); ?></label>
+        <input id="jabberid" class="text" type="text" name="jabber_id" size="50" maxlength="100"
+          value="<?php echo Filters::noXSS(Req::val('jabber_id', $theuser->infos['jabber_id'])); ?>" />
+        <input type="hidden" name="old_jabber_id" value="<?php echo Filters::noXSS($theuser->infos['jabber_id']); ?>" />
+      </li>
+
+      <li>
+        <label for="profileimage"><?php echo Filters::noXSS(L('profileimage')); ?></label>
+        <input id="profileimage" name="profile_image" type="file" value="<?php echo Filters::noXSS(Req::val('profile_image')); ?>"/>
+      </li>
+
+      <li>
+        <label for="notifytype"><?php echo Filters::noXSS(L('notifytype')); ?></label>
+        <select id="notifytype" name="notify_type">
+          <?php echo tpl_options($fs->GetNotificationOptions(),
+                              Req::val('notify_type', $theuser->infos['notify_type'])); ?>
+
+        </select>
+        <?php echo tpl_checkbox('notify_own', Req::val('notify_own', !Post::val('action') && $theuser->infos['notify_own']), 'notify_own'); ?>
+
+        <label class="left notable" for="notify_own"><?php echo Filters::noXSS(L('notifyown')); ?></label>
+      </li>
+
+      <li>
+        <label for="dateformat"><?php echo Filters::noXSS(L('dateformat')); ?></label>
+        <input id="dateformat" class="text" name="dateformat" type="text" size="40" maxlength="30"
+          value="<?php echo Filters::noXSS(Req::val('dateformat', $theuser->infos['dateformat'])); ?>" />
+      </li>
+
+      <li>
+        <label for="dateformat_extended"><?php echo Filters::noXSS(L('dateformat_extended')); ?></label>
+        <input id="dateformat_extended" class="text" name="dateformat_extended" type="text"
+          size="40" maxlength="30" value="<?php echo Filters::noXSS(Req::val('dateformat_extended', $theuser->infos['dateformat_extended'])); ?>" />
+      </li>
+
+      <li>
+        <label for="tasks_perpage"><?php echo Filters::noXSS(L('tasksperpage')); ?></label>
+        <select name="tasks_perpage" id="tasks_perpage">
+          <?php echo tpl_options(array(10, 25, 50, 100, 250), Req::val('tasks_perpage', $theuser->infos['tasks_perpage']), true); ?>
+
+        </select>
+      </li>
+
+      <li>
+        <label for="time_zone"><?php echo Filters::noXSS(L('timezone')); ?></label>
+        <select id="time_zone" name="time_zone">
+          <?php
+            $times = array();
+            for ($i = -12; $i <= 13; $i++) {
+              $times[$i] = L('GMT') . (($i == 0) ? ' ' : (($i > 0) ? '+' . $i : $i));
+            }
+          ?>
+          <?php echo tpl_options($times, Req::val('time_zone', $theuser->infos['time_zone'])); ?>
+
+        </select> 
+      </li>
+
+        <li>
+            <label for="langcode"><?php echo Filters::noXSS(L('language')); ?></label>
+            <select id="langcode" name="lang_code">
+                <?php echo tpl_options(Flyspray::listLangs(), Req::val('lang_code', $theuser->infos['lang_code']), true); ?>
+
+            </select>
+        </li>
+
+      <li>
+        <hr />
+      </li>
+
+      <?php if ($user->perms('is_admin')): ?>
+      <li>
+        <label for="accountenabled"><?php echo Filters::noXSS(L('accountenabled')); ?></label>
+        <?php echo tpl_checkbox('account_enabled', Req::val('account_enabled', !Post::val('action') && $theuser->infos['account_enabled']), 'accountenabled'); ?>
+
+      </li>
+
+      <li>
+        <label for="delete_user"><?php echo Filters::noXSS(L('deleteuser')); ?></label>
+        <?php echo tpl_checkbox('delete_user', false, 'delete_user'); ?>
+
+      </li>
+      <?php endif; ?>
+
+      <li>
+        <label for="groupin"><?php echo Filters::noXSS(L('globalgroup')); ?></label>
+        <select id="groupin" class="adminlist" name="group_in" <?php echo Filters::noXSS(tpl_disableif(!$user->perms('is_admin'))); ?>>
+          <?php echo tpl_options($groups, Req::val('group_in', $theuser->infos['global_group'])); ?>
+
+        </select>
+          <input type="hidden" name="old_global_id" value="<?php echo Filters::noXSS($theuser->infos['global_group']); ?>" />
+      </li>
+
+      <?php if ($proj->id): ?>
+      <li>
+        <label for="projectgroupin"><?php echo Filters::noXSS(L('projectgroup')); ?></label>
+        <select id="projectgroupin" class="adminlist" name="project_group_in" <?php echo Filters::noXSS(tpl_disableif(!$user->perms('manage_project'))); ?>>
+          <?php echo tpl_options(array_merge($project_groups, array(0 => array('group_name' => L('none'), 0 => 0, 'group_id' => 0, 1 => L('none')))), Req::val('project_group_in', $theuser->perms('project_group'))); ?>
+
+        </select>
+          <input type="hidden" name="old_project_id" value="<?php echo Filters::noXSS($theuser->perms('project_group')); ?>" />
+      </li>
+      <?php endif; ?>
+
+      <li>
+        <hr />
+      </li>
+
+      <?php if (! $theuser->infos['oauth_uid']): ?>
+      <?php if (!$user->perms('is_admin') || $user->id == $theuser->id): ?>
+      <?php if (!$fs->prefs['disable_changepw']): ?>
+      <li>
+        <label for="oldpass"><?php echo Filters::noXSS(L('oldpass')); ?></label>
+        <input id="oldpass" class="password" type="password" name="oldpass" value="<?php echo Filters::noXSS(Req::val('oldpass')); ?>" size="40" maxlength="100" />
+      </li>
+
+
+      <li>
+        <label for="changepass"><?php echo Filters::noXSS(L('changepass')); ?></label>
+        <input id="changepass" class="password" type="password" name="changepass" value="<?php echo Filters::noXSS(Req::val('changepass')); ?>" size="40" maxlength="100" />
+      </li>
+
+      <li>
+        <label for="confirmpass"><?php echo Filters::noXSS(L('confirmpass')); ?></label>
+        <input id="confirmpass" class="password" type="password" name="confirmpass" value="<?php echo Filters::noXSS(Req::val('confirmpass')); ?>" size="40" maxlength="100" />
+      </li>
+      <?php endif; ?>
+      <?php endif; ?>
+      <?php endif; ?>
+      <li>
+        <input type="hidden" name="action" value="<?php echo Filters::noXSS(Req::val('action', $do . '.edituser')); ?>" />
+        <?php if (Req::val('area') || $do == 'admin'): ?><input type="hidden" name="area" value="users" /><?php endif; ?>
+        <input type="hidden" name="user_id" value="<?php echo Filters::noXSS($theuser->id); ?>" />
+        <button type="submit"><?php echo Filters::noXSS(L('updatedetails')); ?></button>
+      </li>
+    </ul>
+  </form>
diff --git a/templates/common.userselect.tpl b/templates/common.userselect.tpl
new file mode 100644
index 0000000..dd58eab
--- /dev/null
+++ b/templates/common.userselect.tpl
@@ -0,0 +1,6 @@
+<input class="users text" <?php echo join_attrs($attrs); ?> type="text" name="<?php echo Filters::noXSS($name); ?>" <?php if ($id): ?>id="<?php echo Filters::noXSS($id); ?>"<?php endif; ?> value="<?php echo Filters::noXSS($value); ?>" />
+<span class="autocomplete" id="<?php echo Filters::noXSS($name); ?>_complete"></span>
+<script type="text/javascript">
+    showstuff('<?php echo Filters::noJsXSS($name); ?>_complete');
+    new Ajax.Autocompleter('<?php echo Filters::noJsXSS($id); ?>', '<?php echo Filters::noJsXSS($name); ?>_complete', '<?php echo Filters::noXSS($baseurl); ?>js/callbacks/usersearch.php', {})
+</script>
diff --git a/templates/depends.tpl b/templates/depends.tpl
new file mode 100644
index 0000000..64b2047
--- /dev/null
+++ b/templates/depends.tpl
@@ -0,0 +1,107 @@
+<div style="text-align:center;" class="box">
+  <p><b><?php echo Filters::noXSS(L('pruninglevel')); ?>: </b><?php echo implode(" &nbsp;|&nbsp; \n", $strlist); ?></p>
+  <h2><a href="<?php echo Filters::noXSS(CreateUrl('details', $task_id)); ?>">FS#<?php echo $task_id; ?></a>: <?php echo Filters::noXSS(L('dependencygraph')); ?></h2>
+
+<div id="infovis" style="width:90%;height:50em"></div>    
+
+<script type="text/javascript">
+  // init data
+  var json = <?php echo $jasonData; ?>;  
+   
+   // init ForceDirected
+  var fd = new $jit.ForceDirected({
+    //id of the visualization container
+    injectInto: 'infovis',
+    //Enable zooming and panning
+    //by scrolling and DnD
+    Navigation: {
+      enable: true,
+      //Enable panning events only if we're dragging the empty
+      //canvas (and not a node).
+      zooming: 50 //zoom speed. higher is more sensible
+    },
+    // Change node and edge styles such as
+    // color and width.
+    // These properties are also set per node
+    // with dollar prefixed data-properties in the
+    // JSON structure.
+    Node: {
+      overridable: true,
+    },
+    Edge: {
+      overridable: false,
+      color: '#555555',
+      type: 'arrow', 
+      dim: 25,
+      lineWidth: 1
+    },
+    //Native canvas text styling
+    Label: {
+      type: 'HTML', //Native or HTML
+      size: 10,
+      style: 'bold',
+    },
+    //Add Tips
+    Tips: {
+      enable: true,
+      onShow: function(tip, node) {
+        // Count connections
+        var count = 0;                
+        node.eachAdjacency(function(adj) {  
+            count++;
+        }); 
+
+        // Display node info in tooltip
+        tip.innerHTML = "<div class=\"popup\" style=\"width:200px\">" + node.name
+          + "<div><b><?php echo Filters::noXSS(L('connectedtasks')); ?></b> " + count + "</div></div>";
+      }
+    },
+    // Add node events
+    Events: {
+      enable: true,
+      type: 'Native'
+    },
+    //Number of iterations for the FD algorithm
+    iterations: 50,
+    //Edge length
+    levelDistance: 130,
+    // Add text to the labels. This method is only triggered
+    // on label creation and only for DOM labels (not native canvas ones).
+    onCreateLabel: function(domElement, node){
+      domElement.innerHTML = node.name;
+      var style = domElement.style;
+      style.fontSize = "1em";
+      style.color = "#ddd";
+    },
+    // Change node styles when DOM labels are placed
+    // or moved.
+    onPlaceLabel: function(domElement, node){
+      var style = domElement.style;
+      var left = parseInt(style.left);
+      var top = parseInt(style.top);
+      var w = domElement.offsetWidth;
+      style.left = (left - w / 2) + 'px';
+      style.top = top + 'px';
+      style.padding = 25 + 'px';
+      style.display = '';
+    }
+  });
+  // load JSON data.
+  fd.loadJSON(json);
+  // compute positions incrementally and animate.
+  fd.computeIncremental({
+    iter: 40,
+    property: 'end',
+    onComplete: function(){      
+      fd.animate({
+        modes: ['linear'],
+        transition: $jit.Trans.Elastic.easeOut,
+        duration: 1500
+      });
+    }
+  });
+  // end
+  
+</script>
+
+</div>
\ No newline at end of file
diff --git a/templates/details.edit.tpl b/templates/details.edit.tpl
new file mode 100644
index 0000000..13bb87f
--- /dev/null
+++ b/templates/details.edit.tpl
@@ -0,0 +1,347 @@
+<form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" id="taskeditform" enctype="multipart/form-data" method="post">
+<div id="actionbar">
+	<button class="button positive" type="submit" accesskey="s" onclick="return checkok('<?php echo Filters::noJsXSS($baseurl); ?>js/callbacks/checksave.php?time=<?php echo Filters::noXSS(time()); ?>&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>', '<?php echo Filters::noJsXSS(L('alreadyedited')); ?>', 'taskeditform')"><?php echo Filters::noXSS(L('savedetails')); ?></button>
+	<div class="clear"></div>
+</div>
+
+<!-- Grab fields wanted for this project so we can only show those we want -->
+<?php $fields = explode( ' ', $proj->prefs['visible_fields'] ); ?>
+
+<div id="taskdetails">
+	 <div>
+		<input type="hidden" name="action" value="details.update" />
+        <input type="hidden" name="edit" value="1" />
+		<input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>" />
+		<input type="hidden" name="edit_start_time" value="<?php echo Filters::noXSS(Req::val('edit_start_time', time())); ?>" />
+
+    <div id="taskfields">
+      <ul class="form_elements slim">
+                <!-- Status -->
+                <?php if (in_array('status', $fields)) { ?>
+			<li>
+                <?php } else { ?>
+			<li style="display:none">
+		<?php } ?>
+
+				<label for="status"><?php echo Filters::noXSS(L('status')); ?></label>
+				<select id="status" name="item_status">
+				 <?php echo tpl_options($proj->listTaskStatuses(), Req::val('item_status', $task_details['item_status'])); ?>
+
+				</select>
+			</li>
+
+                <!-- Progress -->
+                <?php if (in_array('progress', $fields)) { ?>
+			<li>
+                <?php } else { ?>
+			<li style="display:none">
+		<?php } ?>
+				<label for="percent"><?php echo Filters::noXSS(L('percentcomplete')); ?></label>
+				<select id="percent" name="percent_complete">
+				 <?php $arr = array(); for ($i = 0; $i<=100; $i+=10) $arr[$i] = $i.'%'; ?>
+				 <?php echo tpl_options($arr, Req::val('percent_complete', $task_details['percent_complete'])); ?>
+
+				</select>
+			</li>
+
+                <!-- Task Type-->
+                <?php if (in_array('tasktype', $fields)) { ?>
+			<li>
+                <?php } else { ?>
+			<li style="display:none">
+		<?php } ?>
+				<label for="tasktype"><?php echo Filters::noXSS(L('tasktype')); ?></label>
+				<select id="tasktype" name="task_type">
+				 <?php echo tpl_options($proj->listTaskTypes(), Req::val('task_type', $task_details['task_type'])); ?>
+
+				</select>
+			</li>
+
+                <!-- Category -->
+                <?php if (in_array('category', $fields)) { ?>
+			<li>
+                <?php } else { ?>
+			<li style="display:none">
+		<?php } ?>
+				<label for="category"><?php echo Filters::noXSS(L('category')); ?></label>
+				<select id="category" name="product_category">
+				 <?php echo tpl_options($proj->listCategories(), Req::val('product_category', $task_details['product_category'])); ?>
+
+				</select>
+			</li>
+
+                <!-- Assigned To-->
+                <?php if (in_array('assignedto', $fields)) { ?>
+			<li>
+                <?php } else { ?>
+			<li style="display:none">
+		<?php } ?>
+				<label><?php echo Filters::noXSS(L('assignedto')); ?></label>
+								<?php if ($user->perms('edit_assignments')): ?>
+
+					<input type="hidden" name="old_assigned" value="<?php echo Filters::noXSS($old_assigned); ?>" />
+									<?php $this->display('common.multiuserselect.tpl'); ?>
+									<?php else: ?>
+											<?php if (empty($assigned_users)): ?>
+											 <?php echo Filters::noXSS(L('noone')); ?>
+
+											 <?php else:
+											 foreach ($assigned_users as $userid):
+											 ?>
+											 <?php echo tpl_userlink($userid); ?><br />
+											 <?php endforeach;
+											 endif; ?>
+									<?php endif; ?>
+				</li>
+
+                <!-- OS -->
+                <?php if (in_array('os', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="os"><?php echo Filters::noXSS(L('operatingsystem')); ?></label>
+					<select id="os" name="operating_system">
+					 <?php echo tpl_options($proj->listOs(), Req::val('operating_system', $task_details['operating_system'])); ?>
+
+					</select>
+				</li>
+
+                <!-- Severity -->
+                <?php if (in_array('severity', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="severity"><?php echo Filters::noXSS(L('severity')); ?></label>
+					<select id="severity" name="task_severity">
+					 <?php echo tpl_options($fs->severities, Req::val('task_severity', $task_details['task_severity'])); ?>
+
+					</select>
+				</li>
+
+                <!-- Priority -->
+                <?php if (in_array('priority', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="priority"><?php echo Filters::noXSS(L('priority')); ?></label>
+					<select id="priority" name="task_priority">
+					 <?php echo tpl_options($fs->priorities, Req::val('task_priority', $task_details['task_priority'])); ?>
+
+					</select>
+				</li>
+
+                <!-- Reported In -->
+                <?php if (in_array('reportedin', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="reportedver"><?php echo Filters::noXSS(L('reportedversion')); ?></label>
+					<select id="reportedver" name="reportedver">
+					<?php echo tpl_options($proj->listVersions(false, 2, $task_details['product_version']), Req::val('reportedver', $task_details['product_version'])); ?>
+
+					</select>
+				</li>
+
+                <!-- Due -->
+                <?php if (in_array('dueversion', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="dueversion"><?php echo Filters::noXSS(L('dueinversion')); ?></label>
+					<select id="dueversion" name="closedby_version">
+					 <option value="0"><?php echo Filters::noXSS(L('undecided')); ?></option>
+					 <?php echo tpl_options($proj->listVersions(false, 3), Req::val('closedby_version', $task_details['closedby_version'])); ?>
+
+					</select>
+				</li>
+
+                <!-- Due Date -->
+                <?php if (in_array('duedate', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="duedate"><?php echo Filters::noXSS(L('duedate')); ?></label>
+					<?php echo tpl_datepicker('due_date', '', Req::val('due_date', $task_details['due_date'])); ?>
+
+				</li>
+
+                <!-- Private -->
+				<?php if ($user->can_change_private($task_details)): ?>
+                <?php if (in_array('private', $fields)) { ?>
+				<li>
+                <?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="private"><?php echo Filters::noXSS(L('private')); ?></label>
+					<?php echo tpl_checkbox('mark_private', Req::val('mark_private', $task_details['mark_private']), 'private'); ?>
+
+				</li>
+				<?php endif; ?>
+
+          <?php if($proj->prefs['use_effort_tracking']) {
+          ?>
+          <li style="...">
+              <label for="estimatedeffort"><?php echo Filters::noXSS(L('estimatedeffort')); ?></label>
+              <input id="estimated_effort" name="estimated_effort" class="text" type="text" size="5" maxlength="100" value="<?php echo Filters::noXSS($task_details['estimated_effort']); ?>" />
+              <?php echo Filters::noXSS(L('hours')); ?>
+
+          </li>
+          <?php } ?>
+
+		<!-- If no currently selected project is not there, push it on there so don't have to change things -->
+		<?php
+			$id = Req::val('project_id', $proj->id);
+
+			$selected = false;
+			foreach ($fs->projects as $value => $label)
+			{
+				if ($label[0] == $id)
+				{
+					$selected = true;
+					break;
+				}
+			}
+
+			if (! $selected)
+			{
+		                $title = '---';
+				$foo = array( $id, $title, 'project_id' => $id, 'project_title' => $title);
+				array_unshift( $fs->projects,  $foo);
+			}
+		?>
+
+		<!-- If there is only one choice of projects, then don't bother showing it -->
+		<?php if (count($fs->projects) > 1) { ?>
+				<li>
+		<?php } else { ?>
+				<li style="display:none">
+		<?php } ?>
+					<label for="tasktype"><?php echo Filters::noXSS(L('attachedtoproject')); ?></label>
+					<select name="project_id">
+					<?php echo tpl_options($fs->projects, Req::val('project_id', $proj->id)); ?>
+
+					</select>
+				</li>
+
+		  </ul>
+
+		<div id="fineprint">
+		  <?php echo Filters::noXSS(L('openedby')); ?> <?php echo tpl_userlink($task_details['opened_by']); ?>
+
+		  - <span title="<?php echo formatDate($task_details['date_opened'], true); ?>"><?php echo formatDate($task_details['date_opened'], false); ?></span>
+		  <?php if ($task_details['last_edited_by']): ?>
+		  <br />
+		  <?php echo Filters::noXSS(L('editedby')); ?>  <?php echo tpl_userlink($task_details['last_edited_by']); ?>
+
+		  - <span title="<?php echo Filters::noXSS(formatDate($task_details['last_edited_time'], true)); ?>"><?php echo Filters::noXSS(formatDate($task_details['last_edited_time'], false)); ?></span>
+		  <?php endif; ?>
+		</div>
+
+		</div>
+
+		<div id="taskdetailsfull">
+
+				<h2 class="summary severity<?php echo Filters::noXSS(Req::val('task_severity', $task_details['task_severity'])); ?>">
+					<a href="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>">FS#<?php echo Filters::noXSS($task_details['task_id']); ?></a> -
+					<input class="text severity<?php echo Filters::noXSS(Req::val('task_severity', $task_details['task_severity'])); ?>" type="text"
+					name="item_summary" size="80" maxlength="100"
+					value="<?php echo Filters::noXSS(Req::val('item_summary', $task_details['item_summary'])); ?>" />
+				</h2>
+
+          <!--<h3 class="taskdesc"><?php echo Filters::noXSS(L('details')); ?></h3>-->
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+						<div class="hide preview" id="preview"></div>
+          <?php endif; ?>
+          <?php echo TextFormatter::textarea('detailed_desc', 15, 70, array('id' => 'details'), Req::val('detailed_desc', $task_details['detailed_desc'])); ?>
+
+          <br />
+          <?php if ($user->perms('add_comments') && (!$task_details['is_closed'] || $proj->prefs['comment_closed'])): ?><!--
+              <button type="button" onclick="showstuff('edit_add_comment');this.style.display='none';"><?php echo Filters::noXSS(L('addcomment')); ?></button>
+              <div id="edit_add_comment" class="hide">
+              <label for="comment_text"><?php echo Filters::noXSS(L('comment')); ?></label>
+
+              <?php if ($user->perms('create_attachments')): ?>
+              <div id="uploadfilebox_c">
+                <span style="display: none"><?php // this span is shown/copied in javascript when adding files ?>
+                  <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+                    <a href="javascript://" tabindex="6" onclick="removeUploadField(this, 'uploadfilebox_c');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+                </span>
+              </div>
+              <button id="uploadfilebox_c_attachafile" tabindex="7" type="button" onclick="addUploadFields('uploadfilebox_c')">
+                <?php echo Filters::noXSS(L('uploadafile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+              </button>
+              <button id="uploadfilebox_c_attachanotherfile" tabindex="7" style="display: none" type="button" onclick="addUploadFields('uploadfilebox_c')">
+                 <?php echo Filters::noXSS(L('attachanotherfile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+              </button>
+              <?php endif; ?>
+
+              <textarea accesskey="r" tabindex="8" id="comment_text" name="comment_text" cols="50" rows="10"></textarea>
+              </div>-->
+          <?php endif; ?>
+		  <p class="buttons">
+              <!--<button type="submit" accesskey="s" onclick="return checkok('<?php echo Filters::noJsXSS($baseurl); ?>js/callbacks/checksave.php?time=<?php echo Filters::noXSS(time()); ?>&amp;taskid=<?php echo Filters::noXSS($task_details['task_id']); ?>', '<?php echo Filters::noJsXSS(L('alreadyedited')); ?>', 'taskeditform')"><?php echo Filters::noXSS(L('savedetails')); ?></button>-->
+              <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+              <button tabindex="9" type="button" onclick="showPreview('details', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+              <?php endif; ?>
+              <button type="reset"><?php echo Filters::noXSS(L('reset')); ?></button>
+      </p>
+
+					<?php $attachments = $proj->listTaskAttachments($task_details['task_id']);
+	          $this->display('common.editattachments.tpl', 'attachments', $attachments); ?>
+
+          <?php if ($user->perms('create_attachments')): ?>
+						<div id="uploadfilebox">
+							<span style="display: none"><?php // this span is shown/copied in javascript when adding files ?>
+								<input tabindex="5" class="file" type="file" size="55" name="usertaskfile[]" />
+									<a href="javascript://" tabindex="6" onclick="removeUploadField(this);"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+							</span>
+							<noscript>
+									<span>
+										<input tabindex="5" class="file" type="file" size="55" name="usertaskfile[]" />
+											<a href="javascript://" tabindex="6" onclick="removeUploadField(this);"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+									</span>
+							</noscript>
+						</div>
+						<button id="uploadfilebox_attachafile" tabindex="7" type="button" onclick="addUploadFields()">
+							<?php echo Filters::noXSS(L('uploadafile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+						</button>
+						<button id="uploadfilebox_attachanotherfile" tabindex="7" style="display: none" type="button" onclick="addUploadFields()">
+							 <?php echo Filters::noXSS(L('attachanotherfile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+						</button>
+<?php endif; ?>
+
+<?php $links = $proj->listTaskLinks($task_details['task_id']);
+                  $this->display('common.editlinks.tpl', 'links', $links); ?>
+
+          <?php if ($user->perms('create_attachments')): ?>
+<div id="addlinkbox">
+    <span style="display: none">
+	 <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	 <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+    </span>
+    <noscript>
+	 <span>
+	       <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	       <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+	 </span>
+    </noscript>
+</div>
+<button id="addlinkbox_addalink" tabindex="10" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addalink')); ?>
+</button>
+<button id="addlinkbox_addanotherlink" tabindex="10" style="display: none" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addalink')); ?>
+</button>
+          <?php endif; ?>
+
+			</div>
+		</div>
+    <div class="clear"></div>
+</div>
+</form>
diff --git a/templates/details.tabs.comment.tpl b/templates/details.tabs.comment.tpl
new file mode 100644
index 0000000..06564b5
--- /dev/null
+++ b/templates/details.tabs.comment.tpl
@@ -0,0 +1,125 @@
+<div id="comments" class="tab">
+  <?php foreach($comments as $comment): ?>
+  <div class="comment_container">
+    <em>
+      <a class="commentlink" name="comment<?php echo Filters::noXSS($comment['comment_id']); ?>" id="comment<?php echo Filters::noXSS($comment['comment_id']); ?>"
+        href="<?php echo Filters::noXSS(CreateURL('details', $task_details['task_id'])); ?>#comment<?php echo Filters::noXSS($comment['comment_id']); ?>">
+        <!--<img src="<?php echo Filters::noXSS($this->get_image('comment')); ?>"-->
+        <!--  title="<?php echo Filters::noXSS(L('commentlink')); ?>" alt="" />-->
+      </a>
+      <!--<?php echo Filters::noXSS(L('commentby')); ?>--> <?php echo tpl_userlink($comment['user_id']); ?> <br />
+      
+      
+      <br />
+      <?php if($fs->prefs['gravatars'] == 1) { ?>
+         <?php echo tpl_userlinkgravatar($comment['user_id'], 50, 'left', '5px'); ?>
+
+        <?php } ?>
+          <?php echo Filters::noXSS(formatDate($comment['date_added'], true)); ?>
+
+      <span class="DoNotPrint">
+        <?php if ($user->perms('edit_comments') || ($user->perms('edit_own_comments') && $comment['user_id'] == $user->id)): ?>
+        <!--&mdash;-->
+        <br>
+        <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=editcomment&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;id=<?php echo Filters::noXSS($comment['comment_id']); ?>">
+          <?php echo Filters::noXSS(L('edit')); ?></a>
+        <?php endif; ?>
+    
+        <?php if ($user->perms('delete_comments')): ?>
+         |
+        <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=details.deletecomment&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;comment_id=<?php echo Filters::noXSS($comment['comment_id']); ?>"
+          onclick="return confirm('<?php echo Filters::noJsXSS(L('confirmdeletecomment')); ?>');">
+          <?php echo Filters::noXSS(L('delete')); ?></a>
+        <?php endif ?>
+      </span>
+
+    </em>
+    
+    <div class="comment">
+    <?php if(isset($comment_changes[$comment['date_added']])): ?>
+    <ul class="comment_changes">
+    <?php foreach($comment_changes[$comment['date_added']] as $change): ?>
+      <li><?php echo event_description($change); ?></li>
+    <?php endforeach; ?>
+    </ul>
+    <?php endif; ?>
+    <div class="commenttext">
+      <?php echo TextFormatter::render($comment['comment_text'], 'comm', $comment['comment_id'], $comment['content']); ?></div>
+      <?php if (isset($comment_attachments[$comment['comment_id']])) {
+                $this->display('common.attachments.tpl', 'attachments', $comment_attachments[$comment['comment_id']]);
+            }
+      ?>
+      <?php if (isset($comment_links[$comment['comment_id']])) {
+                $this->display('common.links.tpl', 'links', $comment_links[$comment['comment_id']]);
+            }
+      ?>
+    </div>
+    
+    
+    <div class="clear"></div>
+  </div>
+
+  <?php endforeach; ?>
+
+  <?php if ($user->perms('add_comments') && (!$task_details['is_closed'] || $proj->prefs['comment_closed'])): ?>
+  <h4><?php echo Filters::noXSS(L('addcomment')); ?></h4>
+  <form enctype="multipart/form-data" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post">
+    <div>
+      <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+      <div class="hide preview" id="preview"></div>
+      <?php endif; ?>
+      <input type="hidden" name="action" value="details.addcomment" />
+      <input type="hidden" name="task_id" value="<?php echo Filters::noXSS(Req::val('task_id', $task_details['task_id'])); ?>" />
+      <?php if ($user->perms('create_attachments')): ?>
+      <div id="uploadfilebox">
+        <span style="display: none;"><?php // this span is shown/copied in javascript when adding files ?>
+          <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+            <a href="javascript://" tabindex="6" onclick="removeUploadField(this);"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+        </span>
+        <noscript>
+          <span>
+            <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+              <a href="javascript://" tabindex="6" onclick="removeUploadField(this);"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+          </span>
+        </noscript>
+      </div>
+      <button id="uploadfilebox_attachafile" tabindex="7" type="button" onclick="addUploadFields()">
+        <?php echo Filters::noXSS(L('uploadafile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+      </button>
+      <button id="uploadfilebox_attachanotherfile" tabindex="7" style="display: none" type="button" onclick="addUploadFields()">
+         <?php echo Filters::noXSS(L('attachanotherfile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+      </button>
+
+<div id="addlinkbox">
+    <span style="display: none">
+	 <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	 <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+    </span>
+    <noscript>
+	 <span>
+	       <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	       <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+	 </span>
+    </noscript>
+</div>
+<button id="addlinkbox_addalink" tabindex="10" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addanotherlink')); ?>
+</button>
+<button id="addlinkbox_addanotherlink" tabindex="10" style="display: none" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addanotherlink')); ?>
+</button>
+      <?php endif; ?>
+      <?php echo TextFormatter::textarea('comment_text', 10, 72, array('accesskey' => 'r', 'tabindex' => 8, 'id' => 'comment_text')); ?>
+
+
+      <button accesskey="s" tabindex="9" type="submit"><?php echo Filters::noXSS(L('addcomment')); ?></button>
+      <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+      <button tabindex="9" type="button" onclick="showPreview('comment_text', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+      <?php endif; ?>
+      <?php if (!$watched): ?>
+      <?php echo tpl_checkbox('notifyme', Req::val('notifyme', !(Req::val('action') == 'details.addcomment')), 'notifyme'); ?> <label class="left" for="notifyme"><?php echo Filters::noXSS(L('notifyme')); ?></label>
+      <?php endif; ?>
+    </div>
+  </form>
+  <?php endif; ?>
+</div>
diff --git a/templates/details.tabs.efforttracking.tpl b/templates/details.tabs.efforttracking.tpl
new file mode 100644
index 0000000..749a43e
--- /dev/null
+++ b/templates/details.tabs.efforttracking.tpl
@@ -0,0 +1,47 @@
+<div id="effort" class="tab">
+    <form enctype="multipart/form-data" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post">
+        <input type="hidden" name="action" value="details.efforttracking"/>
+        <button type="submit" name="start_tracking" value="true"><?php echo Filters::noXSS(L('starteffort')); ?></button>
+        </br>
+        <label for="effort_to_add"><?php echo Filters::noXSS(L('manualeffort')); ?></label>
+        <input id="effort_to_add" name="effort_to_add" class="text" type="text" size="5" maxlength="100" value='00:00'>
+        <button type="submit" name="manual_effort" value="true"><?php echo Filters::noXSS(L('addeffort')); ?></button>
+
+        <table class="userlist history">
+            <tr>
+                <th><?php echo Filters::noXSS(L('date')); ?></th>
+                <th><?php echo Filters::noXSS(L('user')); ?></th>
+                <th><?php echo Filters::noXSS(L('effort')); ?> (H:M)</th>
+                <th></th>
+            </tr>
+            <?php
+            foreach($effort->details as $details){
+            ?>
+            <tr>
+                <td><?php echo Filters::noXSS(formatDate($details['date_added'], true)); ?></td>
+                <td><?php echo tpl_userlink($details['user_id']); ?></td>
+                <td><?php
+            if($details['effort'] == 0)
+             { ?>
+                    <?php echo Filters::noXSS(L('trackinginprogress')); ?> (<?php
+
+                    echo ConvertSeconds(time()-$details['start_timestamp']);
+
+                    ?>)
+                    <?php }
+             else
+             {
+                echo ConvertSeconds($details['effort']);
+             } ?>
+                </td>
+                <td>
+                    <?php if($user->id == $details['user_id'] & is_null($details['end_timestamp'])){ ?>
+                    <button type="submit" name="stop_tracking" value="true"><?php echo Filters::noXSS(L('endeffort')); ?></button>
+                    <button type="submit" name="cancel_tracking" value="true"><?php echo Filters::noXSS(L('cleareffort')); ?></button>
+                    <?php } ?>
+                </td>
+            </tr>
+            <?php } ?>
+        </table>
+    </form>
+</div>
\ No newline at end of file
diff --git a/templates/details.tabs.history.callback.tpl b/templates/details.tabs.history.callback.tpl
new file mode 100644
index 0000000..b2be6a6
--- /dev/null
+++ b/templates/details.tabs.history.callback.tpl
@@ -0,0 +1,32 @@
+<?php if ($details && count($histories)): ?>
+<table class="userlist history">
+  <tr>
+    <th><?php echo Filters::noXSS(L('previousvalue')); ?></th>
+    <th><?php echo Filters::noXSS(L('newvalue')); ?></th>
+  </tr>
+  <tr>
+    <td><?php echo $details_previous; ?></td>
+    <td><?php echo $details_new; ?></td>
+  </tr>
+</table>
+<?php else: ?>
+<table class="userlist history">
+  <tr>
+    <th><?php echo Filters::noXSS(L('eventdate')); ?></th>
+    <th><?php echo Filters::noXSS(L('user')); ?></th>
+    <th><?php echo Filters::noXSS(L('event')); ?></th>
+  </tr>
+
+  <?php foreach($histories as $history): ?>
+  <tr>
+    <td><?php echo Filters::noXSS(formatDate($history['event_date'], false)); ?></td>
+    <?php if($fs->prefs['gravatars'] == 1) { ?>
+    <td><?php echo tpl_userlinkgravatar($history['user_id'], 25, 'left', '0px 5px 0px 0px'); ?> <?php echo tpl_userlink($history['user_id']); ?></td>
+    <?php } else { ?>
+    <td><?php echo tpl_userlink($history['user_id']); ?></td>
+    <?php } ?>
+    <td><?php echo event_description($history); ?></td>
+  </tr>
+  <?php endforeach; ?>
+</table>
+<?php endif; ?>
diff --git a/templates/details.tabs.history.tpl b/templates/details.tabs.history.tpl
new file mode 100644
index 0000000..69d7d79
--- /dev/null
+++ b/templates/details.tabs.history.tpl
@@ -0,0 +1,3 @@
+<div id="history" class="tab">
+  <h3><?php echo Filters::noXSS(L('loading')); ?></h3>
+</div>
diff --git a/templates/details.tabs.notifs.tpl b/templates/details.tabs.notifs.tpl
new file mode 100644
index 0000000..83fd4d7
--- /dev/null
+++ b/templates/details.tabs.notifs.tpl
@@ -0,0 +1,24 @@
+<div id="notify" class="tab">
+  <p><em><?php echo Filters::noXSS(L('theseusersnotify')); ?></em></p>
+  <?php foreach ($notifications as $row): ?>
+  <p>
+    <?php echo tpl_userlink($row['user_id']); ?> -
+    <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=remove_notification&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;user_id=<?php echo Filters::noXSS($row['user_id']); ?>#notify"><?php echo Filters::noXSS(L('remove')); ?></a>
+  </p>
+  <?php endforeach; ?>
+
+  <?php if ($user->perms('manage_project')): ?>
+  <form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>#notify" method="post">
+    <div>
+        <label class="default multisel" for="notif_user_id"><?php echo Filters::noXSS(L('addusertolist')); ?></label>
+        <?php echo tpl_userselect('user_name', Req::val('user_name'), 'notif_user_id'); ?>
+
+
+      <button type="submit"><?php echo Filters::noXSS(L('add')); ?></button>
+      <input type="hidden" name="ids" value="<?php echo Filters::noXSS(Req::num('ids', $task_details['task_id'])); ?>" />
+      <input type="hidden" name="action" value="details.add_notification" />
+    </div><br />
+  </form>
+  <?php endif; ?>
+</div>
+
diff --git a/templates/details.tabs.related.tpl b/templates/details.tabs.related.tpl
new file mode 100644
index 0000000..2be2fd9
--- /dev/null
+++ b/templates/details.tabs.related.tpl
@@ -0,0 +1,57 @@
+<div id="related" class="tab">
+  
+  <div class="related">
+    <form method="post" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>#related" >
+      <table id="tasks_related" class="userlist">
+        <tr>
+          <th>
+            <a class="toggle_selected" href="javascript:ToggleSelected('tasks_related')">
+              <!--<img title="<?php echo Filters::noXSS(L('toggleselected')); ?>" alt="<?php echo Filters::noXSS(L('toggleselected')); ?>" src="<?php echo Filters::noXSS($this->get_image('kaboodleloop')); ?>" width="16" height="16" />-->
+            </a>
+          </th>
+          <th><?php echo Filters::noXSS(L('tasksrelated')); ?> (<?php echo Filters::noXSS(count($related)); ?>)</th>
+        </tr>
+        <?php
+          foreach ($related as $row):
+        ?>
+        <tr>
+          <td class="ttcolumn">
+            <input type="checkbox" name="related_id[]" <?php echo tpl_disableif(!$user->can_edit_task($task_details)); ?> value="<?php echo Filters::noXSS($row['related_id']); ?>" /></td>
+          <td><?php echo tpl_tasklink($row); ?></td>
+        </tr>
+        <?php endforeach; ?>
+        <tr>
+          <td colspan="2">
+            <input type="hidden" name="action" value="remove_related" />
+            <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>" />
+            <button type="submit"><?php echo Filters::noXSS(L('remove')); ?></button>
+          </td>
+        </tr> 
+      </table>
+    </form>
+  </div>
+    
+  <div class="related">
+    <table id="duplicate_tasks" class="userlist">
+      <tr>
+        <th><?php echo Filters::noXSS(L('duplicatetasks')); ?> (<?php echo Filters::noXSS(count($duplicates)); ?>)</th>
+      </tr>
+      <?php foreach ($duplicates as $row): ?>
+      <tr><td><?php echo tpl_tasklink($row); ?></td></tr>
+      <?php endforeach; ?>
+    </table>
+  </div>
+
+  <?php if ($user->can_edit_task($task_details) && !$task_details['is_closed']): ?>
+  <form class="clear" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>#related" method="post" id="formaddrelatedtask">
+    <div>
+      <input type="hidden" name="action" value="details.add_related" />
+      <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>" />
+      <label><?php echo Filters::noXSS(L('addnewrelated')); ?>
+
+        <input name="related_task" id="related_task_input" type="text" class="text" size="10" maxlength="10" /></label>
+      <button type="submit" onclick="return checkok('<?php echo Filters::noJsXSS($baseurl); ?>js/callbacks/checkrelated.php?related_task=' + $('related_task_input').value + '&amp;project=<?php echo Filters::noXSS($proj->id); ?>', '<?php echo Filters::noJsXSS(L('relatedproject')); ?>', 'formaddrelatedtask')"><?php echo Filters::noXSS(L('add')); ?></button>
+    </div>
+  </form>
+  <?php endif; ?>
+</div>
diff --git a/templates/details.tabs.remind.tpl b/templates/details.tabs.remind.tpl
new file mode 100644
index 0000000..bd98866
--- /dev/null
+++ b/templates/details.tabs.remind.tpl
@@ -0,0 +1,80 @@
+<?php if (!$task_details['is_closed']): ?>
+  <div id="remind" class="tab">
+  
+  <form method="post" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>#remind" >
+    <?php if (count($reminders)): ?>
+    <table id="reminders" class="userlist">
+    <tr>
+      <th>
+        <a class="toggle_selected" href="javascript:ToggleSelected('reminders')">
+          <!--<img title="<?php echo Filters::noXSS(L('toggleselected')); ?>" alt="<?php echo Filters::noXSS(L('toggleselected')); ?>" src="<?php echo Filters::noXSS($this->get_image('kaboodleloop')); ?>" width="16" height="16" />-->
+        </a>
+      </th>
+      <th><?php echo Filters::noXSS(L('user')); ?></th>
+      <th><?php echo Filters::noXSS(L('startat')); ?></th>
+      <th><?php echo Filters::noXSS(L('frequency')); ?></th>
+      <th><?php echo Filters::noXSS(L('message')); ?></th>
+    </tr>
+    
+    <?php foreach ($reminders as $row): ?>
+    <tr>
+      <td class="ttcolumn">
+        <input type="checkbox" name="reminder_id[]" <?php echo tpl_disableif(!$user->can_edit_task($task_details)); ?> value="<?php echo Filters::noXSS($row['reminder_id']); ?>" />
+      </td>
+     <td><?php echo tpl_userlink($row['user_id']); ?></td>
+     <td><?php echo Filters::noXSS(formatDate($row['start_time'])); ?></td>
+     <?php
+      // Work out the unit of time to display
+      if ($row['how_often'] < 86400) {
+          $how_often = $row['how_often'] / 3600 . ' ' . L('hours');
+      } elseif ($row['how_often'] < 604800) {
+          $how_often = $row['how_often'] / 86400 . ' ' . L('days');
+      } else {
+          $how_often = $row['how_often'] / 604800 . ' ' . L('weeks');
+      }
+     ?>
+     <td><?php echo Filters::noXSS($how_often); ?></td>
+     <td><?php echo TextFormatter::render($row['reminder_message']); ?></td>
+  </tr>
+    <?php endforeach; ?>
+    <tr><td colspan="4">
+      <input type="hidden" name="action" value="deletereminder" />
+      <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>" />
+      <button type="submit"><?php echo Filters::noXSS(L('remove')); ?></button></td></tr>
+  </table>
+  <?php endif; ?>  
+  </form>
+
+  <fieldset><legend><?php echo Filters::noXSS(L('addreminder')); ?></legend>
+  <form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>#remind" method="post" id="formaddreminder">
+    <div>
+      <input type="hidden" name="action" value="details.addreminder" />
+      <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>" />
+
+        <label class="default multisel" for="to_user_id"><?php echo Filters::noXSS(L('remindthisuser')); ?></label>
+        <?php echo tpl_userselect('to_user_id', Req::val('to_user_id'), 'to_user_id'); ?>
+
+      <br />
+
+      <label for="timeamount1"><?php echo Filters::noXSS(L('thisoften')); ?></label>
+      <input class="text" type="text" value="<?php echo Filters::noXSS(Req::val('timeamount1')); ?>" id="timeamount1" name="timeamount1" size="3" maxlength="3" />
+      <select class="adminlist" name="timetype1">
+        <?php echo tpl_options(array(3600 => L('hours'), 86400 => L('days'), 604800 => L('weeks')), Req::val('timetype1')); ?>
+
+      </select>
+
+      <br />
+
+      <?php echo tpl_datepicker('timeamount2', L('startat'), Req::val('timeamount2', formatDate(time()))); ?>
+
+
+      <br />
+      <textarea class="text" name="reminder_message"
+        rows="10" cols="72"><?php echo Filters::noXSS(Req::val('reminder_message', L('defaultreminder') . "\n\n" . CreateURL('details', $task_details['task_id']))); ?></textarea>
+      <br />
+      <button type="submit"><?php echo Filters::noXSS(L('addreminder')); ?></button>
+    </div>
+  </form>
+  </fieldset>
+</div>
+<?php endif; ?>
diff --git a/templates/details.tabs.tpl b/templates/details.tabs.tpl
new file mode 100644
index 0000000..126d93c
--- /dev/null
+++ b/templates/details.tabs.tpl
@@ -0,0 +1,39 @@
+<ul id="submenu">
+  <?php if ($user->perms('view_comments') || $proj->prefs['others_view'] || ($user->isAnon() && $task_details['task_token'] && Get::val('task_token') == $task_details['task_token'])): ?>
+  <li id="commentstab">
+  <a href="#comments"><?php echo Filters::noXSS(L('comments')); ?> (<?php echo count($comments); ?>)</a>
+  </li>
+  <?php endif; ?>
+
+  <li id="relatedtab">
+  <a href="#related"><?php echo Filters::noXSS(L('relatedtasks')); ?> (<?php echo count($related); ?>/<?php echo count($duplicates); ?>)</a>
+  </li>
+
+  <?php if ($user->perms('manage_project')): ?>
+  <li id="notifytab">
+  <a href="#notify"><?php echo Filters::noXSS(L('notifications')); ?> (<?php echo count($notifications); ?>)</a>
+  </li>
+  <?php if (!$task_details['is_closed']): ?>
+  <li id="remindtab">
+  <a href="#remind"><?php echo Filters::noXSS(L('reminders')); ?> (<?php echo count($reminders); ?>)</a>
+  </li>
+  <?php endif; ?>
+  <?php endif; ?>
+
+  <?php if ($user->perms('view_history')): ?>
+  <li id="historytab">
+    <a id="historytaba" onmousedown="getHistory('<?php echo Filters::noXSS($task_details['task_id']); ?>', '<?php echo Filters::noJsXSS($baseurl); ?>', 'history', '<?php echo Filters::noXSS(Get::num('details')); ?>');"
+       href="<?php echo Filters::noXSS(CreateURL('details', $task_details['task_id'], null)); ?>#history"><?php echo Filters::noXSS(L('history')); ?></a>
+  </li>
+  <?php endif; ?>
+
+    <?php if ($proj->prefs['use_effort_tracking']){ ?>
+    <?php if ($user->perms('view_effort')){ ?>
+    <li id="efforttab">
+        <a href="#effort"><?php echo Filters::noXSS(L('efforttracking')); ?></a>
+    </li>
+
+    <?php
+     }
+   } ?>
+</ul>
diff --git a/templates/details.view.tpl b/templates/details.view.tpl
new file mode 100644
index 0000000..8b90622
--- /dev/null
+++ b/templates/details.view.tpl
@@ -0,0 +1,832 @@
+<div id="actionbar">
+    <?php if ($task_details['is_closed']): //if task is closed ?>
+
+    <?php if ($user->can_close_task($task_details)): ?>
+    <a class="button"
+       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=reopen&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>"><?php echo Filters::noXSS(L('reopenthistask')); ?></a>
+    <?php elseif (!$user->isAnon() && !Flyspray::adminRequestCheck(2, $task_details['task_id'])): ?>
+    <a href="#close" id="reqclose" class="button" onclick="showhidestuff('closeform');"><?php echo Filters::noXSS(L('reopenrequest')); ?></a>
+
+    <div id="closeform" class="popup hide">
+        <form name="form3" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post" id="formclosetask">
+            <div>
+                <input type="hidden" name="action" value="requestreopen"/>
+                <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>"/>
+                <label for="reason"><?php echo Filters::noXSS(L('reasonforreq')); ?></label>
+                <textarea id="reason" name="reason_given"></textarea><br/>
+                <button type="submit"><?php echo Filters::noXSS(L('submitreq')); ?></button>
+            </div>
+        </form>
+    </div>
+    <?php endif; ?>
+
+    <?php else:  //if task is open  ?>
+
+    <?php if ($user->can_close_task($task_details) && !$d_open): ?>
+    <a href="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'], null, array('showclose' => !Req::val('showclose')))); ?>"
+       id="closetask" class="button main" accesskey="y"
+       onclick="showhidestuff('closeform');return false;"> <?php echo Filters::noXSS(L('closetask')); ?></a>
+
+    <div id="closeform"
+         class="<?php if (Req::val('action') != 'details.close' && !Req::val('showclose')): ?>hide <?php endif; ?>popup">
+        <form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post" id="formclosetask">
+            <div>
+                <input type="hidden" name="action" value="details.close"/>
+                <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>"/>
+                <select class="adminlist" name="resolution_reason" onmouseup="Event.stop(event);">
+                    <option value="0"><?php echo Filters::noXSS(L('selectareason')); ?></option>
+                    <?php echo tpl_options($proj->listResolutions(), Req::val('resolution_reason')); ?>
+
+                </select>
+                <button type="submit"><?php echo Filters::noXSS(L('closetask')); ?></button>
+                <br/>
+                <label class="default text" for="closure_comment"><?php echo Filters::noXSS(L('closurecomment')); ?></label>
+                <textarea class="text" id="closure_comment" name="closure_comment" rows="3"
+                          cols="25"><?php echo Filters::noXSS(Req::val('closure_comment')); ?></textarea>
+                <?php if($task_details['percent_complete'] != '100'): ?>
+                <label><?php echo tpl_checkbox('mark100', Req::val('mark100', !(Req::val('action') == 'details.close'))); ?>&nbsp;&nbsp;<?php echo Filters::noXSS(L('mark100')); ?></label>
+                <?php endif; ?>
+            </div>
+        </form>
+    </div>
+
+    <?php elseif (!$d_open && !$user->isAnon() && !Flyspray::AdminRequestCheck(1, $task_details['task_id'])): ?>
+    <a href="#close" id="reqclose" class="button main" onclick="showhidestuff('closeform');"><?php echo Filters::noXSS(L('requestclose')); ?></a>
+
+    <div id="closeform" class="popup hide">
+        <form name="form3" action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post" id="formclosetask">
+            <div>
+                <input type="hidden" name="action" value="requestclose"/>
+                <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>"/>
+                <label for="reason"><?php echo Filters::noXSS(L('reasonforreq')); ?></label>
+                <textarea id="reason" name="reason_given"></textarea><br/>
+                <button type="submit"><?php echo Filters::noXSS(L('submitreq')); ?></button>
+            </div>
+        </form>
+    </div>
+    <?php elseif(!$user->isAnon()): ?>
+    <a href="#closedisabled" id="reqclose" class="tooltip button disabled main" "><?php echo Filters::noXSS(L('closetask')); ?>
+
+    <span class="custom info">
+                    <em><?php echo Filters::noXSS(L('information')); ?></em>
+                    <br>
+        <?php echo Filters::noXSS(L('taskclosedisabled')); ?>
+
+        <br>
+        <?php foreach ($deps as $dependency)
+                    {
+                        echo "FS#".$dependency['task_id']." : ".$dependency['item_summary']."</br>";
+                    }
+                    ?>
+                </span>
+    </a>
+    <?php endif; ?>
+
+    <?php if ($user->can_edit_task($task_details)): ?>
+    <a id="edittask" class="button" accesskey="e"
+       href="<?php echo Filters::noXSS(CreateURL('edittask', $task_details['task_id'])); ?>"> <?php echo Filters::noXSS(L('edittask')); ?></a>
+    <?php endif; ?>
+
+    <?php if ($user->can_take_ownership($task_details)): ?>
+    <a id="own" class="button"
+       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=takeownership&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>"> <?php echo Filters::noXSS(L('assigntome')); ?></a>
+    <?php endif; ?>
+
+    <?php if ($user->can_add_to_assignees($task_details) && !empty($task_details['assigned_to'])): ?>
+    <a id="own_add" class="button"
+       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=addtoassignees&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>"> <?php echo Filters::noXSS(L('addmetoassignees')); ?></a>
+    <?php endif; ?>
+
+    <a href="#" id="actions" class="button main" onclick="showhidestuff('actionsform');"><?php echo Filters::noXSS(L('quickaction')); ?></a>
+
+    <div id="actionsform" class="popup hide">
+        <ul>
+
+            <?php if ($user->can_edit_task($task_details)): ?>
+            <li>
+                <a accesskey="e" href="<?php echo Filters::noXSS(CreateURL('edittask', $task_details['task_id'])); ?>"> <?php echo Filters::noXSS(L('edittask')); ?></a>
+            </li>
+            <?php endif; ?>
+
+            <?php if ($user->can_edit_task($task_details)): ?>
+            <li>
+                <a href="#" onclick="showhidestuff('setparentform');"><?php echo Filters::noXSS(L('setparent')); ?></a>
+
+                <div id="setparentform" class="hide">
+                    </br>
+                    <form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post">
+                        <?php echo Filters::noXSS(L('parenttaskid')); ?>
+
+                        <input type="hidden" name="action" value="details.setparent"/>
+                        <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>"/>
+                        <input class="text" type="text" value="" id="supertask_id" name="supertask_id" size="5"
+                               maxlength="10"/>
+                        <button type="submit" name="submit"><?php echo Filters::noXSS(L('set')); ?></button>
+                    </form>
+                    </br>
+                </div>
+            </li>
+            <?php endif; ?>
+            <?php if ($user->can_edit_task($task_details)): ?>
+            <li>
+                <a href="#" onclick="showhidestuff('associateform');"><?php echo Filters::noXSS(L('associatesubtask')); ?></a>
+
+                <div id="associateform" class="hide">
+                    <br>
+                    <form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post">
+                        <?php echo Filters::noXSS(L('associatetaskid')); ?>
+
+                        <input type="hidden" name="action" value="details.associatesubtask"/>
+                        <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>"/>
+                        <input class="text" type="text" value="" id="associate_subtask_id" name="associate_subtask_id"
+                               size="5" maxlength="10"/>
+                        <button type="submit" name="submit"><?php echo Filters::noXSS(L('set')); ?></button>
+                    </form>
+                    </br>
+                </div>
+            </li>
+            <?php endif; ?>
+            <li>
+                <a href="<?php echo Filters::noXSS(CreateURL('depends', $task_details['task_id'])); ?>"><?php echo Filters::noXSS(L('depgraph')); ?></a>
+            </li>
+            <?php if ($user->can_edit_task($task_details)): ?>
+            <li>
+                <a href="#" onclick="showhidestuff('adddepform');"><?php echo Filters::noXSS(L('adddependenttask')); ?></a>
+                <div id="adddepform" class="hide">
+                    <br>
+                    <form action="<?php echo Filters::noXSS(CreateUrl('details', $task_details['task_id'])); ?>" method="post">
+                        <label for="dep_task_id"><?php echo Filters::noXSS(L('newdependency')); ?></label>
+                        <input type="hidden" name="action" value="details.newdep" />
+                        <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($task_details['task_id']); ?>" />
+                        <input class="text" type="text" value="<?php echo Filters::noXSS(Req::val('dep_task_id')); ?>" id="dep_task_id" name="dep_task_id" size="5" maxlength="10" />
+                        <button type="submit" name="submit"><?php echo Filters::noXSS(L('add')); ?></button>
+                    </form>
+                    </br>
+                </div>
+            </li>
+            <?php endif; ?>
+
+            <?php if ($proj->id && $user->perms('open_new_tasks')): ?>
+            <li>
+                <a href="<?php echo Filters::noXSS(CreateURL('newtask', $proj->id, $task_details['task_id'])); ?>"><?php echo Filters::noXSS(L('addnewsubtask')); ?></a>
+            </li>
+            <?php endif; ?>
+
+            <?php if ($user->can_take_ownership($task_details)): ?>
+            <li>
+                <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=takeownership&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>"> <?php echo Filters::noXSS(L('assigntome')); ?></a>
+            </li>
+            <?php endif; ?>
+
+
+            <?php if ($user->can_add_to_assignees($task_details) && !empty($task_details['assigned_to'])): ?>
+            <li>
+                <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=addtoassignees&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>"> <?php echo Filters::noXSS(L('addmetoassignees')); ?></a>
+            </li>
+            <?php endif; ?>
+
+
+            <?php if ($user->can_vote($task_details) > 0): ?>
+            <li>
+                <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=details.addvote&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>"><?php echo Filters::noXSS(L('voteforthistask')); ?></a>
+            </li>
+            <?php endif; ?>
+
+
+            <?php if (!$user->isAnon()): ?>
+            <?php if (!$watched): ?>
+            <li>
+                <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=details.add_notification&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;user_id=<?php echo Filters::noXSS($user->id); ?>"><?php echo Filters::noXSS(L('watchthistask')); ?></a>
+            </li>
+            <?php endif; ?>
+            <?php endif; ?>
+
+
+            <?php if ($user->can_change_private($task_details) && !$task_details['mark_private']): ?>
+            <li>
+                <a href="#"><?php echo Filters::noXSS(L('privatethistask')); ?></a>
+            </li>
+            <?php endif; ?>
+
+        </ul>
+    </div>
+
+    <?php endif; ?>
+</div>
+
+<script type="text/javascript">
+
+function show_hide(elem, flag)
+{
+	elem.style.display = "none";
+	if(flag)
+		elem.nextElementSibling.style.display = "block";
+	else
+		elem.previousElementSibling.style.display = "block";
+}
+function quick_edit(elem, id)
+{
+	var e = document.getElementById(id);
+	var name = e.name;
+	var value = e.value;
+	var text;
+	if(e.selectedIndex != null)
+		text = e.options[e.selectedIndex].text;
+	else
+		text = document.getElementById("due_date").value;//for due date
+	var xmlHttp = new XMLHttpRequest();
+
+	xmlHttp.onreadystatechange = function()
+	{
+		if(xmlHttp.readyState == 4 && xmlHttp.status == 200)
+		{
+			var target = elem.previousElementSibling;
+			if(target.getElementsByTagName("span").length > 0)//for progress
+			{
+				target.getElementsByTagName("span")[0].innerHTML = text;
+				target.getElementsByClassName("progress_bar")[0].style.width = text;
+			}
+			else
+				target.innerHTML = text; 
+		}
+	}
+	xmlHttp.open("POST", "<?php echo Filters::noXSS($baseurl); ?>js/callbacks/quickedit.php", true);
+	xmlHttp.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+	xmlHttp.send("name=" + name + "&value=" + value + "&task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>");
+	show_hide(elem, false);
+}
+</script>
+
+<!-- Grab fields wanted for this project so we can only show those we want -->
+<?php $fields = explode( ' ', $proj->prefs['visible_fields'] ); ?>
+
+<div id="taskdetails">
+	<span id="navigation"> <?php if ($prev_id): ?>
+        <?php echo tpl_tasklink($prev_id, L('previoustask'), false, array('id'=>'prev', 'accesskey' => 'p')); ?>
+
+        <?php endif; ?>
+        <?php if ($prev_id): ?> | <?php endif; ?>
+        <?php
+		if(isset($_COOKIE['tasklist_type']) && $_COOKIE['tasklist_type'] == 'project'):
+			$params = $_GET; unset($params['do'], $params['action'], $params['task_id'], $params['switch'], $params['project']); 
+			?>
+        <a href="<?php echo Filters::noXSS(CreateUrl('project', $proj->id, null, array('do' => 'index') + $params)); ?>"><?php echo Filters::noXSS(L('tasklist')); ?></a>
+        <?php endif; ?>
+        <?php if (isset($_COOKIE['tasklist_type']) && $_COOKIE['tasklist_type'] == 'assignedtome'): ?>
+        <a href="<?php echo Filters::noXSS(CreateURL('project', $proj->id, null, array('do' => 'index', 'dev' => $user->id))); ?>">My Assigned
+            Tasks</a>
+        <?php endif; ?>
+
+        <?php if ($next_id): ?> | <?php endif; ?>
+        <?php if ($next_id): ?>
+        <?php echo tpl_tasklink($next_id, L('nexttask'), false, array('id'=>'next', 'accesskey' => 'n')); ?>
+
+        <?php endif; ?>
+	</span>
+
+    <div id="taskfields">
+    <div id="intromessage" align="center">Click on each field to quick edit</div>
+    <ul class="fieldslist">
+        <!-- Status -->
+        <?php if (in_array('status', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('status')); ?></span>
+				<span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value">
+					<?php if ($task_details['is_closed']): ?>
+                    <?php echo Filters::noXSS(L('closed')); ?>
+
+                    <?php else: ?>
+                    <?php echo Filters::noXSS($task_details['status_name']); ?>
+
+                    <?php if ($reopened): ?>
+                    &nbsp; <strong class="reopened"><?php echo Filters::noXSS(L('reopened')); ?></strong>
+                    <?php endif; ?>
+                    <?php endif; ?>
+				</span>
+
+		<?php if ($user->can_edit_task($task_details)): ?>
+			<span style="display:none">
+				<div style="float:right"><select id="status" name="item_status">
+				 <?php echo tpl_options($proj->listTaskStatuses(), Req::val('item_status', $task_details['item_status'])); ?>
+
+				</select>
+				<a onclick="quick_edit(this.parentNode.parentNode, 'status')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a onclick="show_hide(this.parentNode.parentNode, false)" href="javascript:void(0)">cancel</a></div>
+			</span>
+		<?php endif; ?>
+
+        </li>
+        <?php endif; ?>
+
+        <!-- Progress -->
+        <?php if (in_array('progress', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('percentcomplete')); ?></span>
+				<span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value">
+					<div class="progress_bar_container" style="width: 90px">
+                        <span><?php echo Filters::noXSS($task_details['percent_complete']); ?>%</span>
+
+                        <div class="progress_bar" style="width:<?php echo Filters::noXSS($task_details['percent_complete']); ?>%"></div>
+                    </div>
+				</span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="percent" name="percent_complete">
+			<?php $arr = array(); for ($i = 0; $i<=100; $i+=10) $arr[$i] = $i.'%'; ?>
+			<?php echo tpl_options($arr, Req::val('percent_complete', $task_details['percent_complete'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'percent')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+	<?php endif; ?>
+
+        </li>
+        <?php endif; ?>
+    </ul>
+    <ul class="fieldslist">
+        <!-- Task Type-->
+        <?php if (in_array('tasktype', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('tasktype')); ?></span>
+            <span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value"><?php echo Filters::noXSS($task_details['tasktype_name']); ?></span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="tasktype" name="task_type">
+			<?php echo tpl_options($proj->listTaskTypes(), Req::val('task_type', $task_details['task_type'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'tasktype')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+
+        </li>
+        <?php endif; ?>
+
+        <!-- Category -->
+        <?php if (in_array('category', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('category')); ?></span>
+				<span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value">
+					<?php foreach ($parent as $cat): ?>
+                    <?php echo Filters::noXSS($cat['category_name']); ?> &#8594;
+                    <?php endforeach; ?>
+                    <?php echo Filters::noXSS($task_details['category_name']); ?>
+
+				</span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="category" name="product_category">
+			 <?php echo tpl_options($proj->listCategories(), Req::val('product_category', $task_details['product_category'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'category')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+        </li>
+        <?php endif; ?>
+
+        <!-- Assigned To-->
+        <?php if (in_array('assignedto', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('assignedto')); ?></span>
+				<span class="value assignedto">
+					<?php if (empty($assigned_users)): ?>
+                    <?php echo Filters::noXSS(L('noone')); ?>
+
+                    <?php else: ?>
+                    <table class="assignedto">
+                        <?php
+					foreach ($assigned_users as $userid):
+					?>
+                        <?php if($fs->prefs['gravatars'] == 1) { ?>
+                        <tr><td><?php echo tpl_userlinkgravatar($userid, 26); ?></td><td><?php echo tpl_userlink($userid); ?></td></tr>
+                        <?php } else { ?>
+                        <tr>
+                            <td class="assignedto_name"><?php echo tpl_userlink($userid); ?></td>
+                        </tr>
+                        <?php } ?>
+                        <?php endforeach;
+					?>
+                    </table>
+                    <?php
+					endif; ?>
+				</span>
+        </li>
+        <?php endif; ?>
+
+        <!-- OS -->
+        <?php if (in_array('os', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('operatingsystem')); ?></span>
+            <span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value"><?php echo Filters::noXSS($task_details['os_name']); ?></span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="os" name="operating_system">
+			 <?php echo tpl_options($proj->listOs(), Req::val('operating_system', $task_details['operating_system'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'os')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+        </li>
+        <?php endif; ?>
+
+        <!-- Severity -->
+        <?php if (in_array('severity', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('severity')); ?></span>
+            <span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value"><?php echo Filters::noXSS($task_details['severity_name']); ?></span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="severity" name="task_severity">
+			 <?php echo tpl_options($fs->severities, Req::val('task_severity', $task_details['task_severity'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'severity')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+        </li>
+        <?php endif; ?>
+
+        <!-- Priority -->
+        <?php if (in_array('priority', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('priority')); ?></span>
+            <span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value"><?php echo Filters::noXSS($task_details['priority_name']); ?></span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="priority" name="task_priority">
+			 <?php echo tpl_options($fs->priorities, Req::val('task_priority', $task_details['task_priority'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'priority')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+        </li>
+        <?php endif; ?>
+
+        <!-- Reported In -->
+        <?php if (in_array('reportedin', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('reportedversion')); ?></span>
+            <span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value"><?php echo Filters::noXSS($task_details['reported_version_name']); ?></span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="reportedver" name="product_version">
+			<?php echo tpl_options($proj->listVersions(false, 2, $task_details['product_version']), Req::val('reportedver', $task_details['product_version'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'reportedver')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+        </li>
+        <?php endif; ?>
+
+        <!-- Due -->
+        <?php if (in_array('dueversion', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('dueinversion')); ?></span>
+				<span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value"><?php if ($task_details['due_in_version_name']): ?>
+                    <?php echo Filters::noXSS($task_details['due_in_version_name']); ?>
+
+                    <?php else: ?>
+                    <?php echo Filters::noXSS(L('undecided')); ?>
+
+                    <?php endif; ?>
+				</span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><select id="dueversion" name="closedby_version">
+			 <option value="0"><?php echo Filters::noXSS(L('undecided')); ?></option>
+			 <?php echo tpl_options($proj->listVersions(false, 3), Req::val('closedby_version', $task_details['closedby_version'])); ?>
+
+			</select>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'dueversion')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+
+        </li>
+        <?php endif; ?>
+
+        <!-- Due Date -->
+        <?php if (in_array('duedate', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('duedate')); ?></span>
+	    <span <?php if ($user->can_edit_task($task_details)): ?>onclick="show_hide(this, true)"<?php endif;?> class="value">
+			<?php echo Filters::noXSS(formatDate($task_details['due_date'], false, L('undecided'))); ?><br><?php
+				$days = (strtotime(date('c', $task_details['due_date'])) - strtotime(date("Y-m-d"))) / (60 * 60 * 24);
+				if($task_details['due_date'] > 0)
+				{
+					if($days <$fs->prefs['days_before_alert'] && $days > 0)
+					{
+						echo "<font style='color: red; font-weight: bold'>".$days." ".L('daysleft')."</font>";
+					}
+					elseif($days < 0)
+					{
+						echo "<font style='color: red; font-weight: bold'>".str_replace('-', '', $days)."
+                        ".L('daysoverdue')."</font>";
+					}
+					elseif($days == 0)
+					{
+						echo "<font style='color: red; font-weight: bold'>".L('duetoday')."</font>";
+					}
+					else
+					{
+						echo $days." ".L('daysleft');
+					}
+				}
+				?>
+				</span>
+
+	<?php if ($user->can_edit_task($task_details)): ?>
+		<span style="display:none">
+			<div style="float:right"><?php echo tpl_datepicker('due_date', '', Req::val('due_date', $task_details['due_date'])); ?>
+			<a onclick="quick_edit(this.parentNode.parentNode, 'due_date')" href="javascript:void(0)">confirm</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="show_hide(this.parentNode.parentNode, false)">cancel</a></div>
+		</span>
+        <?php endif; ?>
+
+        </li>
+        <?php endif; ?>
+        <?php if($proj->prefs['use_effort_tracking']) {
+        ?>
+        <li style="...">
+            <span class="label"><?php echo Filters::noXSS(L('estimatedeffort')); ?></span>
+            <span class="value"><?php echo ConvertSeconds($task_details['estimated_effort']*60*60); ?></span>
+        </li>
+        <li style="...">
+            <span class="label"><?php echo Filters::noXSS(L('actualeffort')); ?></span>
+            <?php
+            $total_effort = 0;
+            foreach($effort->details as $details){
+            $total_effort += $details['effort'];
+            }
+            ?>
+            <span class="value"><?php echo ConvertSeconds($total_effort); ?> </span>
+        </li>
+        <?php } ?>
+    </ul>
+    <ul class="fieldslist">
+        <!-- Votes-->
+        <?php if (in_array('votes', $fields)): ?>
+        <li class="votes">
+            <span class="label"><?php echo Filters::noXSS(L('votes')); ?></span>
+				<span class="value">
+					<?php if (count($votes)): ?>
+                    <a href="javascript:showhidestuff('showvotes')"><?php echo Filters::noXSS(count($votes)); ?> </a>
+					<div id="showvotes" class="hide">
+                        <ul class="reports">
+                            <?php foreach ($votes as $vote): ?>
+                            <li><?php echo tpl_userlink($vote); ?> (<?php echo Filters::noXSS(formatDate($vote['date_time'])); ?>)</li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+                    <?php else: ?>
+                    0
+                    <?php endif; ?>
+                    <?php if ($user->can_vote($task_details) > 0): ?>
+					<a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=details.addvote&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>">
+                        (<?php echo Filters::noXSS(L('addvote')); ?>)</a>
+                    <?php elseif ($user->can_vote($task_details) == -2): ?>
+					(<?php echo Filters::noXSS(L('alreadyvotedthistask')); ?>)
+                    <?php elseif ($user->can_vote($task_details) == -3): ?>
+					(<?php echo Filters::noXSS(L('alreadyvotedthisday')); ?>)
+                    <?php endif; ?>
+				</span>
+        </li>
+        <?php endif; ?>
+
+        <!-- Private -->
+        <?php if (in_array('private', $fields)): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('private')); ?></span>
+				<span class="value">
+						<?php if ($task_details['mark_private']): ?>
+                    <?php echo Filters::noXSS(L('yes')); ?>
+
+                    <?php else: ?>
+                    <?php echo Filters::noXSS(L('no')); ?>
+
+                    <?php endif; ?>
+
+                    <?php if ($user->can_change_private($task_details) && $task_details['mark_private']): ?>
+						<a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=makepublic&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>">
+                            (<?php echo Filters::noXSS(L('makepublic')); ?>)</a>
+                    <?php elseif ($user->can_change_private($task_details) && !$task_details['mark_private']): ?>
+						<a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=makeprivate&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>">
+                            (<?php echo Filters::noXSS(L('makeprivate')); ?>)</a>
+                    <?php endif; ?>
+				</span>
+        </li>
+        <?php endif; ?>
+
+
+        <!-- Watching -->
+        <?php if (!$user->isAnon()): ?>
+        <li>
+            <span class="label"><?php echo Filters::noXSS(L('watching')); ?></span>
+				<span class="value">
+							<?php if ($watched): ?>
+                    <?php echo Filters::noXSS(L('yes')); ?>
+
+                    <?php else: ?>
+                    <?php echo Filters::noXSS(L('no')); ?>
+
+                    <?php endif; ?>
+
+                    <?php if (!$watched): ?>
+                    <a accesskey="w"
+                       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=details.add_notification&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;user_id=<?php echo Filters::noXSS($user->id); ?>">
+                        (<?php echo Filters::noXSS(L('watchtask')); ?>)</a>
+                    <?php else: ?>
+                    <a accesskey="w"
+                       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;action=remove_notification&amp;ids=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;user_id=<?php echo Filters::noXSS($user->id); ?>">
+                        (<?php echo Filters::noXSS(L('stopwatching')); ?>)</a>
+                    <?php endif; ?>
+				</span>
+        </li>
+        <?php endif; ?>
+    </ul>
+
+    <div id="fineprint">
+        <?php echo Filters::noXSS(L('attachedtoproject')); ?>: <a
+                href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?project=<?php echo Filters::noXSS($task_details['project_id']); ?>"><?php echo Filters::noXSS($task_details['project_title']); ?></a>
+        <br/>
+        <?php echo Filters::noXSS(L('openedby')); ?> <?php echo tpl_userlink($task_details['opened_by']); ?>
+
+        <?php if ($task_details['anon_email'] && $user->perms('view_tasks')): ?>
+        (<?php echo Filters::noXSS($task_details['anon_email']); ?>)
+        <?php endif; ?>
+        -
+        <span title="<?php echo Filters::noXSS(formatDate($task_details['date_opened'], true)); ?>"><?php echo Filters::noXSS(formatDate($task_details['date_opened'], false)); ?></span>
+        <?php if ($task_details['last_edited_by']): ?>
+        <br/>
+        <?php echo Filters::noXSS(L('editedby')); ?>  <?php echo tpl_userlink($task_details['last_edited_by']); ?>
+
+        -
+        <span title="<?php echo Filters::noXSS(formatDate($task_details['last_edited_time'], true)); ?>"><?php echo Filters::noXSS(formatDate($task_details['last_edited_time'], false)); ?></span>
+        <?php endif; ?>
+    </div>
+
+    </div>
+
+
+    <div id="taskdetailsfull">
+        <h2 class="summary severity<?php echo Filters::noXSS($task_details['task_severity']); ?>">
+            FS#<?php echo Filters::noXSS($task_details['task_id']); ?> - <?php echo Filters::noXSS($task_details['item_summary']); ?>
+
+        </h2>
+        <h4>
+            Tags: <?php echo Filters::noXSS($tag_list); ?>
+
+        </h4>
+        <!--<h3 class="taskdesc"><?php echo Filters::noXSS(L('details')); ?></h3>-->
+
+        <div id="taskdetailstext"><?php echo $task_text; ?></div>
+
+        <?php $attachments = $proj->listTaskAttachments($task_details['task_id']);
+        $this->display('common.attachments.tpl', 'attachments', $attachments); ?>
+
+        <?php $links = $proj->listTaskLinks($task_details['task_id']);
+        $this->display('common.links.tpl', 'links', $links); ?>
+    </div>
+
+    <div id="taskinfo">
+        <?php if(!count($deps)==0): ?>
+        <?php $projects = $fs->listProjects(); ?>
+        <table id="dependency_table" class="table" width="100%">
+            <caption>This task depends on the following tasks.</caption>
+            <thead>
+            <tr>
+                <th><?php echo Filters::noXSS(L('id')); ?></th>
+                <th><?php echo Filters::noXSS(L('project')); ?></th>
+                <th><?php echo Filters::noXSS(L('summary')); ?></th>
+                <th><?php echo Filters::noXSS(L('priority')); ?></th>
+                <th><?php echo Filters::noXSS(L('severity')); ?></th>
+                <th><?php echo Filters::noXSS(L('progress')); ?></th>
+                <th><?php echo Filters::noXSS(L('assignedto')); ?></th>
+                <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($deps as $dependency): ?>
+            <tr>
+                <td><?php echo $dependency['task_id'] ?></td>
+                <td><?php echo $projects[$dependency['project_id']-1]['project_title'] ?></td>
+                <td><?php echo tpl_tasklink($dependency['task_id']); ?></td>
+                <td><?php echo $fs->priorities[$dependency['task_priority']] ?></td>
+                <td class="severity<?php echo Filters::noXSS($dependency['task_severity']); ?>"><?php echo $fs->
+                    severities[$dependency['task_severity']] ?>
+                </td>
+                <td class="task_progress">
+                    <div class="progress_bar_container">
+                        <span><?php echo Filters::noXSS($dependency['percent_complete']); ?>%</span>
+
+                        <div class="progress_bar" style="width:<?php echo Filters::noXSS($dependency['percent_complete']); ?>%"></div>
+                    </div>
+                </td>
+                <td>Assignees TODO</td>
+                <td>
+                    <a class="removedeplink"
+                       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=removedep&amp;depend_id=<?php echo Filters::noXSS($dependency['depend_id']); ?>&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>">
+                        <img src="<?php echo Filters::noXSS($this->get_image('button_cancel')); ?>" alt="<?php echo Filters::noXSS(L('remove')); ?>" title="<?php echo Filters::noXSS(L('remove')); ?>"/>
+                    </a>
+                </td>
+            </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+        <?php endif; ?>
+        <?php
+            if (!$task_details['supertask_id']==0)
+            {
+                $task_description = "&nbsp;&nbsp;This task is a sub task of ". ': ' . tpl_tasklink($task_details['supertask_id']);
+                print $task_description;
+            }
+
+        ?>
+        <?php if(!count($subtasks)==0): ?>
+        <?php $projects = $fs->listProjects(); ?>
+        <table id="subtask_table" class="table" width="100%">
+            <caption>This task has the following sub-tasks.</caption>
+            <thead>
+            <tr>
+                <th><?php echo Filters::noXSS(L('id')); ?></th>
+                <th><?php echo Filters::noXSS(L('project')); ?></th>
+                <th><?php echo Filters::noXSS(L('summary')); ?></th>
+                <th><?php echo Filters::noXSS(L('priority')); ?></th>
+                <th><?php echo Filters::noXSS(L('severity')); ?></th>
+                <th><?php echo Filters::noXSS(L('progress')); ?></th>
+                <th><?php echo Filters::noXSS(L('assignedto')); ?></th>
+                <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($subtasks as $subtaskOrgin): ?>
+            <?php $subtask = $fs->GetTaskDetails($subtaskOrgin['task_id']); ?>
+            <tr id="task<?php echo $subtask['task_id']; ?>" class="severity<?php echo Filters::noXSS($subtask['task_severity']); ?>">
+                <td><?php echo $subtask['task_id'] ?></td>
+                <td><?php echo $projects[$subtask['project_id']-1]['project_title'] ?></td>
+                <td><?php echo tpl_tasklink($subtask['task_id']); ?></td>
+                <td><?php echo $fs->priorities[$subtask['task_priority']] ?></td>
+                <td class="severity<?php echo Filters::noXSS($subtask['task_severity']); ?>"><?php echo $fs->severities[$subtask['task_severity']]
+                    ?>
+                </td>
+                <td class="task_progress">
+                    <div class="progress_bar_container">
+                        <span><?php echo Filters::noXSS($subtask['percent_complete']); ?>%</span>
+
+                        <div class="progress_bar" style="width:<?php echo Filters::noXSS($subtask['percent_complete']); ?>%"></div>
+                    </div>
+                </td>
+                <td>Assignees TODO</td>
+                <td>
+                    <a class="removedeplink"
+                       href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=removesubtask&amp;subtaskid=<?php echo Filters::noXSS($subtask['task_id']); ?>&amp;task_id=<?php echo Filters::noXSS($task_details['task_id']); ?>">
+                        <img src="<?php echo Filters::noXSS($this->get_image('button_cancel')); ?>" alt="<?php echo Filters::noXSS(L('remove')); ?>" title="<?php echo Filters::noXSS(L('remove')); ?>"/>
+                    </a>
+                </td>
+            </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+        <?php endif; ?>
+    </div>
+</div>
+
+<?php if ($task_details['is_closed']): ?>
+<div id="taskclosed">
+    <?php echo Filters::noXSS(L('closedby')); ?>&nbsp;&nbsp;<?php echo tpl_userlink($task_details['closed_by']); ?><br/>
+    <?php echo Filters::noXSS(formatDate($task_details['date_closed'], true)); ?><br/>
+    <strong><?php echo Filters::noXSS(L('reasonforclosing')); ?></strong> &nbsp;<?php echo Filters::noXSS($task_details['resolution_name']); ?><br/>
+    <?php if ($task_details['closure_comment']): ?>
+    <strong><?php echo Filters::noXSS(L('closurecomment')); ?></strong>
+    &nbsp;<?php echo wordwrap(TextFormatter::render($task_details['closure_comment']), 40, "\n", true); ?>
+
+    <?php endif; ?>
+</div>
+<?php endif; ?>
+
+<div id="actionbuttons">
+
+    <?php if (count($penreqs)): ?>
+    <div class="pendingreq"><strong><?php echo Filters::noXSS(formatDate($penreqs[0]['time_submitted'])); ?>
+
+            : <?php echo Filters::noXSS(L('request'.$penreqs[0]['request_type'])); ?></strong>
+        <?php if ($penreqs[0]['reason_given']): ?>
+        <?php echo Filters::noXSS(L('reasonforreq')); ?>: <?php echo Filters::noXSS($penreqs[0]['reason_given']); ?>
+
+        <?php endif; ?>
+    </div>
+    <?php endif; ?>
+</div>
+
+<div class="clear"></div>
+</div>
+
diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl
new file mode 100644
index 0000000..27579ed
--- /dev/null
+++ b/templates/editcomment.tpl
@@ -0,0 +1,73 @@
+<h3><?php echo Filters::noXSS(L('editcomment')); ?></h3>
+<div class="box">
+<form action="<?php echo Filters::noXSS(CreateUrl('details', $comment['task_id'])); ?>" enctype="multipart/form-data" method="post">
+    <div>
+    <p><?php echo Filters::noXSS(L('commentby')); ?> <?php echo Filters::noXSS($comment['real_name']); ?> - <?php echo Filters::noXSS(formatDate($comment['date_added'], true)); ?></p>
+    <?php 
+    $attachments = $proj->listAttachments($comment['comment_id']);
+    $this->display('common.editattachments.tpl', 'attachments', $attachments); 
+    
+    if ($user->perms('create_attachments')): ?>
+      <div id="uploadfilebox">
+        <span style="display: none"><?php // this span is shown/copied in javascript when adding files ?>
+          <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+            <a href="javascript://" tabindex="6" onclick="removeUploadField(this);"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+        </span>
+        <noscript>
+          <span>
+            <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+              <a href="javascript://" tabindex="6" onclick="removeUploadField(this);"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+          </span>   
+        </noscript> 
+      </div>
+      <button id="uploadfilebox_attachafile" tabindex="7" type="button" onclick="addUploadFields()">
+        <?php echo Filters::noXSS(L('uploadafile')); ?>
+
+      </button>
+      <button id="uploadfilebox_attachanotherfile" tabindex="7" style="display: none" type="button" onclick="addUploadFields()">
+         <?php echo Filters::noXSS(L('attachanotherfile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+      </button>
+     <?php endif; ?>
+
+     <?php
+     $links = $proj->listLinks($comment['comment_id']);
+     $this->display('common.editlinks.tpl', 'links', $links);
+
+    if ($user->perms('create_attachments')): ?>
+      <div id="addlinkbox">
+    <span style="display: none">
+	 <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	 <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+    </span>
+    <noscript>
+	 <span>
+	       <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	       <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+	 </span>
+    </noscript>
+</div>
+<button id="addlinkbox_addalink" tabindex="10" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addalink')); ?>
+</button>
+<button id="addlinkbox_addanotherlink" tabindex="10" style="display: none" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addanotherlink')); ?>
+</button>
+    <?php endif; ?>
+    
+    <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+    <div class="hide preview" id="preview"></div>
+    <?php endif; ?>
+    <?php echo TextFormatter::textarea('comment_text', 10, 72, array('id' => 'comment_text'), $comment['comment_text']); ?>
+
+
+    <input type="hidden" name="action" value="editcomment" />
+    <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($comment['task_id']); ?>" />
+    <input type="hidden" name="comment_id" value="<?php echo Filters::noXSS($comment['comment_id']); ?>" />
+    <input type="hidden" name="previous_text" value="<?php echo Filters::noXSS($comment['comment_text']); ?>" />
+    <button type="submit"><?php echo Filters::noXSS(L('saveeditedcomment')); ?></button>
+    <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+    <button tabindex="9" type="button" onclick="showPreview('comment_text', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+    <?php endif; ?>
+    </div>
+</form>
+</div>
diff --git a/templates/feed.atom.tpl b/templates/feed.atom.tpl
new file mode 100644
index 0000000..eaad14a
--- /dev/null
+++ b/templates/feed.atom.tpl
@@ -0,0 +1,32 @@
+<?php echo '<?xml version="1.0" ?>'; ?>
+
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title type="text"><?php echo Filters::noXSS($fs->prefs['page_title']); ?></title>
+  <subtitle type="text">
+    <?php echo Filters::noXSS($feed_description); ?>
+
+  </subtitle>
+  <id><?php echo Filters::noXSS($baseurl); ?></id>
+  <?php if($feed_image): ?>
+  <icon><?php echo Filters::noXSS($feed_image); ?></icon>
+  <?php endif; ?>
+  <updated><?php echo Filters::noXSS(date('Y-m-d\TH:i:s\Z',$most_recent)); ?></updated>
+  <link rel="self" type="text/xml" href="feed.php?feed_type=atom"/>
+  <link rel="alternate" type="text/html" hreflang="en" href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>"/>
+  <?php foreach ($task_details as $row): ?>
+  <entry>
+    <title>FS#<?php echo Filters::noXSS($row['task_id']); ?>: <?php echo Filters::noXSS($row['item_summary']); ?></title>
+    <link href="<?php echo Filters::noXSS(CreateURL('details', $row['task_id'])); ?>" />    
+    <updated><?php echo Filters::noXSS(date('Y-m-d\TH:i:s\Z',intval($row['last_edited_time']))); ?></updated>    
+    <published><?php echo Filters::noXSS(date('Y-m-d\TH:i:s\Z',intval($row['date_opened']))); ?></published>
+    <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/">
+      <div xmlns="http://www.w3.org/1999/xhtml">
+        <?php echo TextFormatter::render($row['detailed_desc']); ?>
+
+      </div>
+    </content>
+    <author><name><?php echo Filters::noXSS($row['real_name']); ?></name></author>
+    <id><?php echo Filters::noXSS($baseurl); ?>:<?php echo Filters::noXSS($row['task_id']); ?></id>
+  </entry>
+  <?php   endforeach; ?>
+</feed>
diff --git a/templates/feed.rss1.tpl b/templates/feed.rss1.tpl
new file mode 100644
index 0000000..36c3110
--- /dev/null
+++ b/templates/feed.rss1.tpl
@@ -0,0 +1,33 @@
+<?php echo '<?xml version="1.0" ?>'; ?>
+
+<rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" 
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+  xmlns="http://purl.org/rss/1.0/"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/">
+  <channel rdf:about="<?php echo Filters::noXSS($baseurl); ?>">
+    <title><?php echo Filters::noXSS($fs->prefs['page_title']); ?></title>
+    <link><?php echo Filters::noXSS($baseurl); ?></link>
+    <description><?php echo Filters::noXSS($feed_description); ?></description>
+    <dc:date><?php echo Filters::noXSS(date('Y-m-d\TH:i:s\Z',$most_recent)); ?></dc:date>
+    <items>
+      <rdf:Seq>
+        <?php foreach($task_details as $row): ?>
+        <rdf:li rdf:resource="<?php echo Filters::noXSS(CreateURL('details', $row['task_id'])); ?>" />
+        <?php endforeach; ?>
+      </rdf:Seq>
+    </items>
+    <?php if($feed_image): ?>
+    <image rdf:resource="<?php echo Filters::noXSS($feed_image); ?>" />
+    <?php endif; ?>		
+  </channel>
+  <?php foreach($task_details as $row): ?>
+  <item rdf:about="<?php echo Filters::noXSS(CreateURL('details', $row['task_id'])); ?>">
+    <title>FS#<?php echo Filters::noXSS($row['task_id']); ?>: <?php echo Filters::noXSS($row['item_summary']); ?></title>
+    <link><?php echo Filters::noXSS(CreateURL('details', $row['task_id'])); ?></link>
+    <dc:date><?php echo Filters::noXSS(date('Y-m-d\TH:i:s\Z',intval($row['last_edited_time']))); ?></dc:date>
+    <dc:creator><?php echo Filters::noXSS($row['real_name']); ?></dc:creator>
+    <description><?php echo Filters::noXSS(strip_tags(TextFormatter::render($row['detailed_desc']))); ?></description>
+    <content:encoded><![CDATA[<?php echo TextFormatter::render($row['detailed_desc']); ?>]]></content:encoded>
+  </item>
+  <?php endforeach; ?>
+</rdf:RDF>
diff --git a/templates/feed.rss2.tpl b/templates/feed.rss2.tpl
new file mode 100644
index 0000000..9c4061a
--- /dev/null
+++ b/templates/feed.rss2.tpl
@@ -0,0 +1,27 @@
+<?php echo '<?xml version="1.0" ?>'; ?>
+
+<rss version="2.0">
+  <channel>
+    <title><?php echo Filters::noXSS($fs->prefs['page_title']); ?></title>
+    <lastBuildDate><?php echo Filters::noXSS(date('r',$most_recent)); ?></lastBuildDate>
+    <description><?php echo Filters::noXSS($feed_description); ?></description>
+    <link><?php echo Filters::noXSS($baseurl); ?></link>
+    <?php if($feed_image): ?>
+    <image>
+      <url><?php echo Filters::noXSS($feed_image); ?></url>
+      <link><?php echo Filters::noXSS($baseurl); ?></link>
+      <title>[Logo]</title>
+    </image>
+    <?php endif;
+    foreach($task_details as $row):?>
+    <item>
+      <title>FS#<?php echo Filters::noXSS($row['task_id']); ?>: <?php echo Filters::noXSS($row['item_summary']); ?></title>
+      <author><?php echo Filters::noXSS($row['real_name']); ?></author>
+      <pubDate><?php echo Filters::noXSS(date('r',intval($row['date_opened']))); ?></pubDate>
+      <description><![CDATA[<?php echo str_replace(chr(13), "<br />", Filters::noXSS(strip_tags($row['detailed_desc']))); ?>]]></description>
+      <link><?php echo Filters::noXSS(CreateURL('details', $row['task_id'])); ?></link>
+      <guid><?php echo Filters::noXSS(CreateURL('details', $row['task_id'])); ?></guid>
+    </item>
+    <?php endforeach; ?>
+  </channel>
+</rss>
diff --git a/templates/footer.tpl b/templates/footer.tpl
new file mode 100644
index 0000000..0a3ca7e
--- /dev/null
+++ b/templates/footer.tpl
@@ -0,0 +1,9 @@
+    </div>
+    <p id="footer">
+       <!-- Please don't remove this line - it helps promote Flyspray -->
+       <a href="http://flyspray.org/" class="offsite"><?php echo Filters::noXSS(L('poweredby')); ?><?php if ($user->perms('is_admin')): ?> <?php echo Filters::noXSS($fs->version); ?>  <?php echo Filters::noXSS($fs->getSvnRev()); ?><?php endif; ?></a><br/>
+       <i><a href="http://www.thevelozgroup.com"><?php echo Filters::noXSS(L('sponsoredby')); ?> The Veloz Group</a></i>
+    </p>
+  </div>
+  </body>
+</html>
diff --git a/templates/header.tpl b/templates/header.tpl
new file mode 100644
index 0000000..4f93eec
--- /dev/null
+++ b/templates/header.tpl
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo Filters::noXSS(L('locale')); ?>" xml:lang="<?php echo Filters::noXSS(L('locale')); ?>">
+  <head>
+    <title><?php echo Filters::noXSS($this->_title); ?></title>
+
+    <meta name="description" content="Flyspray, a Bug Tracking System written in PHP." />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Script-Type" content="text/javascript" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
+    <?php if(trim($this->get_image('favicon'))): ?>
+    <link rel="icon" type="image/png" href="<?php echo Filters::noXSS($this->get_image('favicon')); ?>" />
+    <?php endif; ?>
+    <link rel="index" id="indexlink" type="text/html" href="<?php echo Filters::noXSS($baseurl); ?>" />
+    <?php foreach ($fs->projects as $project): ?>
+    <link rel="section" type="text/html" href="<?php echo Filters::noXSS($baseurl); ?>?project=<?php echo Filters::noXSS($project[0]); ?>" />
+    <?php endforeach; ?>
+    <link media="screen" href="<?php echo Filters::noXSS($this->themeUrl()); ?>theme.css" rel="stylesheet" type="text/css" />
+    <link media="print"  href="<?php echo Filters::noXSS($this->themeUrl()); ?>theme_print.css" rel="stylesheet" type="text/css" />
+    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="alternate" type="application/rss+xml" title="Flyspray RSS 1.0 Feed"
+          href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss1&amp;project=<?php echo Filters::noXSS($proj->id); ?>" />
+    <link rel="alternate" type="application/rss+xml" title="Flyspray RSS 2.0 Feed"
+          href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss2&amp;project=<?php echo Filters::noXSS($proj->id); ?>" />
+	<link rel="alternate" type="application/atom+xml" title="Flyspray Atom 0.3 Feed"
+	      href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=atom&amp;project=<?php echo Filters::noXSS($proj->id); ?>" />
+
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/prototype/prototype.js"></script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/script.aculo.us/scriptaculous.js"></script>
+    <?php if ('index' == $do || 'details' == $do): ?>
+        <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/<?php echo Filters::noXSS($do); ?>.js"></script>
+    <?php endif; ?>
+    <?php if ( $do == 'pm' || $do == 'admin'): ?>
+        <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/tablecontrol.js"></script>
+    <?php endif; ?>
+    <?php if ( $do == 'depends'): ?>
+        <!--[if IE]><script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/jit/excanvas.js"></script><![endif]-->
+        <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/jit/jit.js"></script>
+    <?php endif; ?>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/tabs.js"></script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/functions.js"></script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/jscalendar/calendar_stripped.js"></script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/jscalendar/calendar-setup_stripped.js"> </script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/jscalendar/lang/calendar-<?php echo Filters::noXSS(substr(L('locale'), 0, 2)); ?>.js"></script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/lightbox/js/lightbox.js"></script>
+    <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>js/ckeditor/ckeditor.js"></script>
+    <link rel="stylesheet" href="<?php echo Filters::noXSS($baseurl); ?>js/lightbox/css/lightbox.css" type="text/css" media="screen" />
+    <!--[if IE]>
+    <link media="screen" href="<?php echo Filters::noXSS($this->themeUrl()); ?>ie.css" rel="stylesheet" type="text/css" />
+    <![endif]-->
+    <?php foreach(TextFormatter::get_javascript() as $file): ?>
+        <script type="text/javascript" src="<?php echo Filters::noXSS($baseurl); ?>plugins/<?php echo Filters::noXSS($file); ?>"></script>
+    <?php endforeach; ?>
+  </head>
+  <body onload="perms = new Perms('permissions');<?php
+        if (isset($_SESSION['SUCCESS']) && isset($_SESSION['ERROR'])):
+        ?>window.setTimeout('Effect.Fade(\'mixedbar\', {duration:.3})', 10000);<?php
+        elseif (isset($_SESSION['SUCCESS'])):
+        ?>window.setTimeout('Effect.Fade(\'successbar\', {duration:.3})', 8000);<?php
+        elseif (isset($_SESSION['ERROR'])):
+        ?>window.setTimeout('Effect.Fade(\'errorbar\', {duration:.3})', 8000);<?php endif ?>"
+				<?php if(isset($_GET['do'])) echo 'class="'.$_GET['do'].'"'; else echo 'class="index"'; ?>
+				>
+
+    <!-- Display title and logo if desired -->
+    <h1 id="title"><a href="<?php echo Filters::noXSS($baseurl); ?>">
+	<?php if (isset($fs->prefs['logo']) && $fs->prefs['logo'] != '') { ?>
+		<img src="<?php echo Filters::noXSS('/'.$fs->prefs['logo']); ?>">
+	<?php } ?>
+	<?php echo Filters::noXSS($proj->prefs['project_title']); ?>
+
+    </a></h1>
+
+    <?php $this->display('links.tpl'); ?>
+
+    <?php if (isset($_SESSION['SUCCESS']) && isset($_SESSION['ERROR'])): ?>
+    <div id="mixedbar" class="mixed bar" onclick="this.style.display='none'"><div class="errpadding"><?php echo Filters::noXSS($_SESSION['SUCCESS']); ?><br /><?php echo Filters::noXSS($_SESSION['ERROR']); ?></div></div>
+    <?php elseif (isset($_SESSION['ERROR'])): ?>
+    <div id="errorbar" class="error bar" onclick="this.style.display='none'"><div class="errpadding"><?php echo Filters::noXSS($_SESSION['ERROR']); ?></div></div>
+    <?php elseif (isset($_SESSION['SUCCESS'])): ?>
+    <div id="successbar" class="success bar" onclick="this.style.display='none'"><div class="errpadding"><?php echo Filters::noXSS($_SESSION['SUCCESS']); ?></div></div>
+    <?php endif; ?>
+
+    <div id="content">
+      <div class="clear"></div>
+
+      <?php $show_message = array(/*'details',*/ 'index', /*'newtask',*/ 'reports', 'depends');
+            $actions = explode('.', Req::val('action'));
+            if ($fs->prefs['intro_message'] &&
+                    (  $proj->id== 0 || $proj->prefs['disp_intro'] ) &&
+                    (in_array($do, $show_message) || in_array(reset($actions), $show_message)) ): ?>
+      <div id="intromessage"><?php echo TextFormatter::render($fs->prefs['intro_message'], 'msg', $proj->id); ?></div>
+      <?php endif; ?>
+
+      <?php $show_message = array(/*'details',*/ 'index', /*'newtask',*/ 'reports', 'depends');
+            $actions = explode('.', Req::val('action'));
+            if ($proj->prefs['intro_message'] && (in_array($do, $show_message) || in_array(reset($actions), $show_message))): ?>
+	<div id="intromessage"><?php echo TextFormatter::render($proj->prefs['intro_message'], 'msg', $proj->id,
+                               ($proj->prefs['last_updated'] < $proj->prefs['cache_update']) ? $proj->prefs['pm_instructions'] : ''); ?></div>
+      <?php endif; ?>
+    
diff --git a/templates/index.tpl b/templates/index.tpl
new file mode 100644
index 0000000..8e0fb45
--- /dev/null
+++ b/templates/index.tpl
@@ -0,0 +1,669 @@
+<script type="text/javascript">
+    //Used for dynamically displaying the bulk edit pane, when Checkboxes are >1
+    function BulkEditCheck()
+    {
+        var form = document.getElementById('massops');
+        var count = 0;
+        for(var n=0;n < form.length;n++){
+            if(form[n].name == 'ids[]' && form[n].checked){
+                count++;
+            }
+        }
+
+        if(count == 0)
+        {
+            Effect.Fade('bulk_edit_selectedItems',{ duration: 0.2 });
+        }
+        if(count == 1)
+        {
+            Effect.Appear('bulk_edit_selectedItems',{ duration: 0.2 });
+        }
+    }
+
+    function massSelectBulkEditCheck()
+    {
+        var form = document.getElementById('massops');
+        var check_count = 0, uncheck_count;
+        for(var n=0;n < form.length;n++){
+            if(form[n].name == 'ids[]'){
+		if(form[n].checked)
+		    check_count++;
+		else
+		    uncheck_count++;
+            }
+        }
+
+        if(check_count == 0)
+        {
+            Effect.Appear('bulk_edit_selectedItems',{ duration: 0.2 });
+        }
+
+        if(uncheck_count == 0)
+        {
+            Effect.Fade('bulk_edit_selectedItems',{ duration: 0.2 });
+        }
+    }
+
+    function ClearAssignments()
+    {
+        document.getElementById('bulk_assignment').options.length = 0;
+    }
+</script>
+
+<?php if(isset($update_error)): ?>
+<div id="updatemsg">
+    <span class="bad"> <?php echo Filters::noXSS(L('updatewrong')); ?></span>
+    <a href="?hideupdatemsg=yep"><?php echo Filters::noXSS(L('hidemessage')); ?></a>
+</div>
+<?php endif; ?>
+
+<?php if(isset($updatemsg)): ?>
+<div id="updatemsg">
+    <a href="http://flyspray.org/"><?php echo Filters::noXSS(L('updatefs')); ?></a> <?php echo Filters::noXSS(L('currentversion')); ?>
+
+    <span class="bad"><?php echo Filters::noXSS($fs->version); ?></span> <?php echo Filters::noXSS(L('latestversion')); ?> <span class="good"><?php echo Filters::noXSS($_SESSION['latest_version']); ?></span>.
+    <a href="?hideupdatemsg=yep"><?php echo Filters::noXSS(L('hidemessage')); ?></a>
+</div>
+<?php endif; ?>
+
+<?php if (!($user->isAnon() && count($fs->projects) == 0)): ?>
+<?php $filter = false; if($proj->id > 0) { $filter = true; $fields = explode( ' ', $proj->prefs['visible_fields'] );} ?>
+<div id="search">
+    <map id="projectsearchform" name="projectsearchform">
+        <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+            <div>
+                <button id="searchthisproject" type="submit"><?php echo Filters::noXSS(L('searchthisproject')); ?></button>
+                <input class="text" id="searchtext" name="string" type="text" size="20"
+                       maxlength="100" value="<?php echo Filters::noXSS(Get::val('string')); ?>" accesskey="q"/>
+
+                <input type="hidden" name="project" value="<?php echo Filters::noXSS(Get::num('project', $proj->id)); ?>"/>
+
+        <span id="searchstate" style="cursor:pointer">
+	        <a onclick="toggleSearchBox('<?php echo Filters::noJsXSS($this->themeUrl()); ?>');return false;"
+               href="<?php echo Filters::noXSS(CreateUrl('project', $proj->id, null, array_merge($_GET, array('toggleadvanced' => 1)))); ?>">
+						<span id="advancedsearchstate" class="showstate">
+							<img id="advancedsearchstateimg"
+                                 src="<?php echo (Cookie::val('advancedsearch')) ? $this->get_image('edit_remove') : $this->get_image('edit_add'); ?>"
+                                 alt="<?php echo (Cookie::val('advancedsearch')) ? '-' : '+'; ?>"/>
+						</span><?php echo Filters::noXSS(L('advanced')); ?>
+
+            </a>
+        </span>
+
+                <div id="sc2" class="switchcontent"
+                <?php if (!Cookie::val('advancedsearch')):?>style="display:none;"<?php endif; ?> >
+
+                <?php if (!$user->isAnon()): ?>
+                <fieldset>
+                    <div class="save_search"><label for="save_search" id="lblsaveas"><?php echo Filters::noXSS(L('saveas')); ?></label>
+                        <input class="text" type="text" value="<?php echo Filters::noXSS(Get::val('search_name')); ?>" id="save_search"
+                               name="search_name" size="15"/>
+                        &nbsp;
+                        <button onclick="savesearch('<?php echo Filters::escapeqs($_SERVER['QUERY_STRING']); ?>', '<?php echo Filters::noJsXSS($baseurl); ?>', '<?php echo Filters::noXSS(L('saving')); ?>')"
+                                type="button"><?php echo Filters::noXSS(L('OK')); ?></button>
+                    </div>
+                </fieldset>
+                <?php endif; ?>
+
+
+                <fieldset class="advsearch_misc">
+                    <legend><?php echo Filters::noXSS(L('miscellaneous')); ?></legend>
+                    <?php echo tpl_checkbox('search_in_comments', Get::has('search_in_comments'), 'sic'); ?>
+
+                    <label class="left" for="sic"><?php echo Filters::noXSS(L('searchcomments')); ?></label>
+
+                    <?php echo tpl_checkbox('search_in_details', Get::has('search_in_details'), 'search_in_details'); ?>
+
+                    <label class="left" for="search_in_details"><?php echo Filters::noXSS(L('searchindetails')); ?></label>
+
+                    <?php echo tpl_checkbox('search_for_all', Get::has('search_for_all'), 'sfa'); ?>
+
+                    <label class="left" for="sfa"><?php echo Filters::noXSS(L('searchforall')); ?></label>
+
+                    <?php echo tpl_checkbox('only_watched', Get::has('only_watched'), 'only_watched'); ?>
+
+                    <label class="left" for="only_watched"><?php echo Filters::noXSS(L('taskswatched')); ?></label>
+
+                    <?php echo tpl_checkbox('only_primary', Get::has('only_primary'), 'only_primary'); ?>
+
+                    <label class="left" for="only_primary"><?php echo Filters::noXSS(L('onlyprimary')); ?></label>
+
+                    <?php echo tpl_checkbox('has_attachment', Get::has('has_attachment'), 'has_attachment'); ?>
+
+                    <label class="left" for="has_attachment"><?php echo Filters::noXSS(L('hasattachment')); ?></label>
+
+                    <?php echo tpl_checkbox('hide_subtasks', Get::has('hide_subtasks'), 'hide_subtasks'); ?>
+
+                    <label class="left" for="hide_subtasks"><?php echo Filters::noXSS(L('hidesubtasks')); ?></label>
+                </fieldset>
+
+                <fieldset class="advsearch_task">
+
+                    <legend><?php echo Filters::noXSS(L('taskproperties')); ?></legend>
+            <!-- Task Type -->
+		    <?php if (!$filter || in_array('tasktype', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="type"><?php echo Filters::noXSS(L('tasktype')); ?></label>
+                        <select name="type[]" id="type" multiple="multiple" size="5">
+                            <?php echo tpl_options(array('' => L('alltasktypes')) + $proj->listTaskTypes(), Get::val('type', '')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Severity -->
+		    <?php if (!$filter || in_array('severity', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="sev"><?php echo Filters::noXSS(L('severity')); ?></label>
+                        <select name="sev[]" id="sev" multiple="multiple" size="5">
+                            <?php echo tpl_options(array('' => L('allseverities')) + $fs->severities, Get::val('sev', '')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Priority -->
+		    <?php if (!$filter || in_array('priority', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="pri"><?php echo Filters::noXSS(L('priority')); ?></label>
+                        <select name="pri[]" id="pri" multiple="multiple" size="5">
+                            <?php echo tpl_options(array('' => L('allpriorities')) + $fs->priorities, Get::val('pri', '')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Due Version -->
+		    <?php if (!$filter || in_array('dueversion', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="due"><?php echo Filters::noXSS(L('dueversion')); ?></label>
+                        <select name="due[]" id="due" multiple="multiple" size="5">
+                            <?php echo tpl_options(array_merge(array('' => L('dueanyversion'), 0 => L('unassigned')), $proj->listVersions(false)), Get::val('due', '')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Reportedin -->
+		    <?php if (!$filter || in_array('reportedin', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="reported"><?php echo Filters::noXSS(L('reportedversion')); ?></label>
+                        <select name="reported[]" id="reported" multiple="multiple" size="5">
+                            <?php echo tpl_options(array('' => L('anyversion')) + $proj->listVersions(false), Get::val('reported', '')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Category -->
+		    <?php if (!$filter || in_array('category', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="cat"><?php echo Filters::noXSS(L('category')); ?></label>
+                        <select name="cat[]" id="cat" multiple="multiple" size="5">
+                            <?php echo tpl_options(array('' => L('allcategories')) + $proj->listCategories(), Get::val('cat', '')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Status -->
+		    <?php if (!$filter || in_array('status', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="status"><?php echo Filters::noXSS(L('status')); ?></label>
+                        <select name="status[]" id="status" multiple="multiple" size="5">
+                            <?php echo tpl_options(array('' => L('allstatuses')) +
+                            array('open' => L('allopentasks')) +
+                            array('closed' => L('allclosedtasks')) +
+                            $proj->listTaskStatuses(), Get::val('status', 'open')); ?>
+
+                        </select>
+                    </div>
+
+            <!-- Progress -->
+		    <?php if (!$filter || in_array('progress', $fields)) { ?>
+                    <div class="search_select">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <label class="default multisel" for="percent"><?php echo Filters::noXSS(L('percentcomplete')); ?></label>
+                        <select name="percent[]" id="percent" multiple="multiple" size="5">
+                            <?php $percentages = array(); for ($i = 0; $i <= 100; $i += 10) $percentages[$i] = $i; ?>
+                            <?php echo tpl_options(array('' => L('anyprogress')) + $percentages, Get::val('percent', '')); ?>
+
+                        </select>
+                    </div>
+                    <div class="clear"></div>
+                </fieldset>
+
+                <fieldset class="advsearch_users">
+                    <legend><?php echo Filters::noXSS(L('users')); ?></legend>
+                    <label class="default multisel" for="opened"><?php echo Filters::noXSS(L('openedby')); ?></label>
+                    <?php echo tpl_userselect('opened', Get::val('opened'), 'opened'); ?>
+
+		    <?php if (!$filter || in_array('assignedto', $fields)) { ?>
+                    <label class="default multisel" for="dev"><?php echo Filters::noXSS(L('assignedto')); ?></label>
+                    <?php echo tpl_userselect('dev', Get::val('dev'), 'dev'); } ?>
+
+
+                    <label class="default multisel" for="closed"><?php echo Filters::noXSS(L('closedby')); ?></label>
+                    <?php echo tpl_userselect('closed', Get::val('closed'), 'closed'); ?>
+
+                </fieldset>
+
+                <fieldset class="advsearch_dates">
+                    <legend><?php echo Filters::noXSS(L('dates')); ?></legend>
+            <!-- Due Date -->
+		    <?php if (!$filter || in_array('duedate', $fields)) { ?>
+                    <div class="dateselect">
+		    <?php } else { ?>
+		    <div style="display:none">
+		    <?php } ?>
+                        <?php echo tpl_datepicker('duedatefrom', L('selectduedatefrom')); ?>
+
+                        <?php echo tpl_datepicker('duedateto', L('selectduedateto')); ?>
+                    </div>
+
+                    <div class="dateselect">
+                        <?php echo tpl_datepicker('changedfrom', L('selectsincedatefrom')); ?>
+
+                        <?php echo tpl_datepicker('changedto', L('selectsincedateto')); ?>
+
+                    </div>
+
+                    <div class="dateselect">
+                        <?php echo tpl_datepicker('openedfrom', L('selectopenedfrom')); ?>
+
+                        <?php echo tpl_datepicker('openedto', L('selectopenedto')); ?>
+
+                    </div>
+
+                    <div class="dateselect">
+                        <?php echo tpl_datepicker('closedfrom', L('selectclosedfrom')); ?>
+
+                        <?php echo tpl_datepicker('closedto', L('selectclosedto')); ?>
+
+                    </div>
+                </fieldset>
+
+            </div>
+            <input type="hidden" name="do" value="index"/>
+
+ <!--- Added 2/1/2014 LAE --!>
+
+ <form action="<?php echo Filters::noXSS($baseurl); ?>/scripts/index.php" method="post">
+  &nbsp;&nbsp;&nbsp&nbsp<input type='submit' name='export_list' value='Export Tasklist'>
+ </form>
+
+</div>
+
+</form>
+</map>
+</div>
+<?php endif; ?>
+
+<div id="tasklist">
+<form action="<?php echo Filters::noXSS(CreateURL('project', $proj->id, null, $_GET)); ?>" name="massops" id="massops" method="post">
+<div>
+<table id="tasklist_table">
+    <thead>
+    <tr>
+        <th class="caret">
+        </th>
+        <?php if (!$user->isAnon()): ?>
+        <th class="ttcolumn">
+            <?php if (!$user->isAnon() && $total): ?>
+            <a title="<?php echo Filters::noXSS(L('toggleselected')); ?>" href="javascript:ToggleSelected('massops')" onclick="massSelectBulkEditCheck();">
+            </a>
+            <?php endif; ?>
+        </th>
+        <?php endif; ?>
+        <?php foreach ($visible as $col): ?>
+        <?php echo tpl_list_heading($col, "<th%s>%s</th>"); ?>
+
+        <?php endforeach; ?>
+    </tr>
+    </thead>
+    <tbody>
+    <script type="text/javascript">
+	var cX = 0; var cY = 0; var rX = 0; var rY = 0;
+	function UpdateCursorPosition(e){ cX = e.pageX; cY = e.pageY;}
+	function UpdateCursorPositionDocAll(e){ cX = e.clientX; cY = e.clientY;}
+	if(document.all) { document.onmousemove = UpdateCursorPositionDocAll; }
+	else { document.onmousemove = UpdateCursorPosition; }
+	function AssignPosition(d) {
+		if(self.pageYOffset)
+		{
+			rX = self.pageXOffset;
+			rY = self.pageYOffset;
+		}
+		else if(document.documentElement && document.documentElement.scrollTop) {
+			rX = document.documentElement.scrollLeft;
+			rY = document.documentElement.scrollTop;
+		}
+		else if(document.body) {
+			rX = document.body.scrollLeft;
+			rY = document.body.scrollTop;
+		}
+		if(document.all) {
+			cX += rX; 
+			cY += rY;
+		}
+		d.style.left = (cX+10) + "px";
+		d.style.top = (cY+10) + "px";
+	}
+	function Show(elem, id)
+	{
+		var div = document.getElementById("desc_"+id);
+		AssignPosition(div);
+		div.style.display = "block";
+	}
+	function Hide(elem, id)
+	{
+		document.getElementById("desc_"+id).style.display = "none";
+	}
+    </script>
+    <?php foreach ($tasks as $task_details):?>
+    <tr id="task<?php echo $task_details['task_id']; ?>" class="severity<?php echo Filters::noXSS($task_details['task_severity']); ?>" onmouseover="Show(this,<?php echo $task_details['task_id']; ?>)" onmouseout="Hide(this, <?php echo $task_details['task_id']; ?>)">
+        <td class="caret">
+        </td>
+        <?php if (!$user->isAnon()): ?>
+        <td class="ttcolumn">
+            <input class="ticktask" type="checkbox" name="ids[]" onclick="BulkEditCheck()" value="<?php echo Filters::noXSS($task_details['task_id']); ?>"/>
+        </td>
+        <?php endif;?>
+
+        <?php foreach ($visible as $col):
+						if($col == 'progress'):?>
+        <td class="task_progress">
+            <div class="progress_bar_container">
+                <span><?php echo Filters::noXSS($task_details['percent_complete']); ?>%</span>
+
+                <div class="progress_bar" style="width:<?php echo Filters::noXSS($task_details['percent_complete']); ?>%"></div>
+            </div>
+        </td>
+        <?php else: ?>
+        <?php echo tpl_draw_cell($task_details, $col); ?>
+
+        <?php endif; endforeach; ?>
+<div id="desc_<?php echo $task_details['task_id']; ?>" class="descbox box">
+<b>Task Description:</b>
+<?php echo $task_details['detailed_desc'] ? $task_details['detailed_desc'] : "<p>No Description</p>"; ?>
+</div>
+    </tr>
+    <?php endforeach; ?>
+    </tbody>
+</table>
+<table id="pagenumbers">
+    <tr>
+        <?php if ($total): ?>
+        <td id="taskrange">
+            <?php echo sprintf(L('taskrange'), $offset + 1,
+            ($offset + $perpage > $total ? $total : $offset + $perpage), $total); ?>
+
+            <?php if (!$proj->id == 0 && !$user->isAnon() && $total){ ?>
+            <?php } ?>
+        </td>
+        <td id="numbers">
+            <?php echo pagenums($pagenum, $perpage, $total); ?>
+
+        </td>
+        <?php else: ?>
+        <td id="taskrange"><strong><?php echo Filters::noXSS(L('noresults')); ?></strong></td>
+        <?php endif; ?>
+    </tr>
+</table>
+
+
+
+<!--- Bulk editing Tasks --->
+<?php if (!$proj->id == 0): ?>
+<?php if (!$user->isAnon() && $total): ?>
+<!-- Grab fields wanted for this project so we only show those specified in the settings -->
+<script>Effect.Fade('bulk_edit_selectedItems');</script>
+<div id="bulk_edit_selectedItems" style="display:none">
+    <fieldset>
+        <legend><b><?php echo Filters::noXSS(L('updateselectedtasks')); ?></b></legend>
+        <ul class="form_elements slim">
+            <input type="hidden" name="action" value="task.bulkupdate" />
+            <input type="hidden" name="user_id" value="<?php echo Filters::noXSS($user->id); ?>"/>
+            <!-- Quick Actions -->
+            <li>
+                <label for="bulk_quick_action"><?php echo Filters::noXSS(L('quickaction')); ?></label>
+                <select name="bulk_quick_action" id="bulk_quick_action">
+                    <option value="0"><?php echo Filters::noXSS(L('notspecified')); ?></option>
+                    <option value="bulk_start_watching"><?php echo Filters::noXSS(L('watchtasks')); ?></option>
+                    <option value="bulk_stop_watching"><?php echo Filters::noXSS(L('stopwatchingtasks')); ?></option>
+                    <option value="bulk_take_ownership"><?php echo Filters::noXSS(L('assigntaskstome')); ?></option>
+                </select>
+            </li>
+            <!-- Status -->
+            <?php if (in_array('status', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+
+                <label for="bulk_status"><?php echo Filters::noXSS(L('status')); ?></label>
+                <select id="bulk_status" name="bulk_status">
+                    <?php $statusList = $proj->ListTaskStatuses(); ?>
+                    <?php array_unshift($statusList,L('notspecified')); ?>
+                    <?php echo tpl_options($statusList); ?>
+
+                </select>
+            </li>
+
+            <!-- Progress -->
+            <?php if (in_array('progress', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <label for="bulk_percent"><?php echo Filters::noXSS(L('percentcomplete')); ?></label>
+                <select id="bulk_percent" name="bulk_percent_complete">
+                    <?php $percentCompleteList = array();$percentCompleteList[0]=L('notspecified'); for ($i = 1; $i<=101; $i+=10) $percentCompleteList[$i-1] =''.($i-1).'%'; ?>
+                    <?php echo tpl_options($percentCompleteList); ?>
+
+                </select>
+            </li>
+
+            <!-- Task Type-->
+            <?php if (in_array('tasktype', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $taskTypeList = $proj->listTaskTypes(); ?>
+                <?php array_unshift($taskTypeList,L('notspecified')); ?>
+                <label for="bulk_tasktype"><?php echo Filters::noXSS(L('tasktype')); ?></label>
+                <select id="bulk_tasktype" name="bulk_task_type">
+                    <?php echo tpl_options($taskTypeList); ?>
+
+                </select>
+
+            </li>
+
+            <!-- Category -->
+            <?php if (in_array('category', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $categoryTypeList = $proj->listCategories(); ?>
+                <?php array_unshift($categoryTypeList,L('notspecified')); ?>
+                <label for="bulk_category"><?php echo Filters::noXSS(L('category')); ?></label>
+                <select id="bulk_category" name="bulk_category">
+                    <?php echo tpl_options($categoryTypeList); ?>
+
+                </select>
+
+            </li>
+
+            <!-- Assigned To-->
+            <li>
+                <?php if ($user->perms('edit_assignments')): ?>
+                <label for="bulk_assignment"><?php echo Filters::noXSS(L('assignedto')); ?></label>
+                <?php
+                        //insert a noone into the list in order to bulk de-assign tasks
+                        $noone[0]=array(0,L('noone'));
+                        array_unshift($userlist,$noone);
+                ?>
+                <select size="8" style="height: 200px;" name="bulk_assignment[]" id="bulk_assignment" multiple>
+                    <?php foreach ($userlist as $group => $users): ?>
+                    <optgroup <?php if($group == '0'){ ?> label='Please Select... ' <?php } else { ?> label='<?php echo Filters::noXSS($group); ?>' <?php } ?> >
+                        <?php foreach ($users as $info): ?>
+                        <option value="<?php echo Filters::noXSS($info[0]); ?>"><?php echo Filters::noXSS($info[1]); ?></option>
+                        <?php endforeach; ?>
+                    </optgroup>
+                    <?php endforeach; ?>
+                </select>
+                <?php endif; ?>
+            </li>
+
+            <!-- OS -->
+            <?php if (in_array('os', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $osTypeList = $proj->listOs(); ?>
+                <?php array_unshift($osTypeList,L('notspecified')); ?>
+                <label for="bulk_os"><?php echo Filters::noXSS(L('operatingsystem')); ?></label>
+                <select id="bulk_os" name="bulk_os">
+                    <?php echo tpl_options($osTypeList); ?>
+
+                </select>
+            </li>
+
+            <!-- Severity -->
+            <?php if (in_array('severity', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $severityTypeList = array_reverse($fs->severities); ?>
+                <?php array_unshift($severityTypeList,L('notspecified')); ?>
+                <label for="bulk_severity"><?php echo Filters::noXSS(L('severity')); ?></label>
+                <select id="bulk_severity" name="bulk_severity">
+                    <?php echo tpl_options($severityTypeList); ?>
+
+                </select>
+            </li>
+
+            <!-- Priority -->
+            <?php if (in_array('priority', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+
+                <?php $priorityTypeList = array_reverse($fs->priorities); ?>
+                <?php array_unshift($priorityTypeList,L('notspecified')); ?>
+                <label for="bulk_priority"><?php echo Filters::noXSS(L('priority')); ?></label>
+                <select id="bulk_priority" name="bulk_priority">
+                    <?php echo tpl_options($priorityTypeList); ?>
+
+                </select>
+            </li>
+
+            <!-- Reported In -->
+            <?php if (in_array('reportedin', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $reportedVerList = $proj->listVersions(); ?>
+                <?php array_unshift($reportedVerList,L('notspecified')); ?>
+                <label for="bulk_reportedver"><?php echo Filters::noXSS(L('reportedversion')); ?></label>
+                <select id="bulk_reportedver" name="bulk_reportedver">
+                    <?php echo tpl_options($reportedVerList); ?>
+
+                </select>
+            </li>
+
+            <!-- Due -->
+            <?php if (in_array('dueversion', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $dueInVerList = $proj->listVersions(); ?>
+                <?php array_unshift($dueInVerList,L('undecided')); ?>
+                <?php array_unshift($dueInVerList,L('notspecified')); ?>
+                <label for="bulk_dueversion"><?php echo Filters::noXSS(L('dueinversion')); ?></label>
+                <select id="bulk_dueversion" name="bulk_due_version">
+                    <?php echo tpl_options($dueInVerList); ?>
+
+                </select>
+            </li>
+
+            <!-- Due Date -->
+            <?php if (in_array('duedate', $fields)) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <label for="bulk_due_date"><?php echo Filters::noXSS(L('duedate')); ?></label>
+                <?php echo tpl_datepicker('bulk_due_date'); ?>
+
+            </li>
+
+            <!-- Projects -->
+            <!-- If there is only one choice of project, then don't bother showing it -->
+            <?php if (count($fs->projects) > 1) { ?>
+            <li>
+                <?php } else { ?>
+            <li style="display:none">
+                <?php } ?>
+                <?php $projectsList = $fs->listProjects(); ?>
+                <?php array_unshift($projectsList,L('notspecified')); ?>
+                <label for="bulk_projects"><?php echo Filters::noXSS(L('attachedtoproject')); ?></label>
+                <select id="bulk_projects" name="bulk_projects">
+                    <?php echo tpl_options($projectsList); ?>
+
+                </select>
+            </li>
+            </li>
+
+        </ul>
+
+        <button type="submit" name="updateselectedtasks" value="true"><?php echo Filters::noXSS(L('updateselectedtasks')); ?></button>
+    </fieldset>
+    <fieldset>
+	<legend><b>Close selected tasks</b></legend>
+            <div>
+                <select class="adminlist" name="resolution_reason" onmouseup="Event.stop(event);">
+                    <option value="0"><?php echo Filters::noXSS(L('selectareason')); ?></option>
+                    <?php echo tpl_options($proj->listResolutions(), Req::val('resolution_reason')); ?>
+
+                </select>
+                <button type="submit" name="updateselectedtasks" value="false">close tasks</button>
+                <br/>
+                <label class="default text" for="closure_comment"><?php echo Filters::noXSS(L('closurecomment')); ?></label>
+                <textarea class="text" id="closure_comment" name="closure_comment" rows="3"
+                          cols="25"><?php echo Filters::noXSS(Req::val('closure_comment')); ?></textarea>
+                <label><?php echo tpl_checkbox('mark100', Req::val('mark100', !(Req::val('action') == 'details.close'))); ?>&nbsp;&nbsp;<?php echo Filters::noXSS(L('mark100')); ?></label>
+            </div>
+    </fiedlset>
+
+</div>
+
+<?php endif ?>
+<?php endif ?>
+</div>
+</form>
+</div>
diff --git a/templates/links.searches.tpl b/templates/links.searches.tpl
new file mode 100644
index 0000000..30f4a4a
--- /dev/null
+++ b/templates/links.searches.tpl
@@ -0,0 +1,14 @@
+    <strong id="nosearches" <?php if(count($user->searches)): ?>class="hide"<?php endif; ?>><?php echo Filters::noXSS(L('nosearches')); ?></strong>
+    <?php if(count($user->searches)): ?>
+    <table id="mysearchestable">
+    <?php foreach ($user->searches as $search): ?>
+    <tr id="rs<?php echo Filters::noXSS($search['id']); ?>" <?php if($search == end($user->searches)): ?>class="last"<?php endif; ?>>
+      <td><a href="<?php echo Filters::noXSS($baseurl); ?>?do=index&amp;<?php echo http_build_query(unserialize($search['search_string']), '', '&amp;'); ?>"><?php echo Filters::noXSS($search['name']); ?></a></td>
+      <td class="searches_delete">
+        <a href="javascript:deletesearch('<?php echo Filters::noXSS($search['id']); ?>','<?php echo Filters::noJsXSS($baseurl); ?>')">
+        <img src="<?php echo Filters::noXSS($this->get_image('button_cancel')); ?>" width="12" height="12" title="<?php echo Filters::noXSS(L('delete')); ?>" alt="<?php echo Filters::noXSS(L('delete')); ?>" /></a>
+      </td>
+    </tr>
+    <?php endforeach; ?>
+    </table>
+    <?php endif; ?>
diff --git a/templates/links.tpl b/templates/links.tpl
new file mode 100644
index 0000000..4387861
--- /dev/null
+++ b/templates/links.tpl
@@ -0,0 +1,167 @@
+<div id="menu">
+
+		<ul id="menu-list">
+<?php if ($user->isAnon()): ?>
+			<li class="first">
+				<a id="show_loginbox" accesskey="l" href="#login" onclick="this.addClassName('active'); showhidestuff('loginbox');return false;"><?php echo Filters::noXSS(L('login')); ?></a>
+				<div id="loginbox" class="popup hide">
+		    <?php $this->display('loginbox.tpl'); ?>
+			</div></li>
+      <?php else: ?>
+			<li class="first" onmouseover="perms.do_later('show')" onmouseout="perms.hide()">
+				<a id="profilelink"
+					<?php if(isset($_GET['do']) and $_GET['do'] == 'myprofile'): ?> class="active" <?php endif; ?>
+					 href="<?php echo Filters::noXSS(CreateURL('myprofile')); ?>" title="<?php echo Filters::noXSS(L('editmydetails')); ?>">
+					<em><?php echo Filters::noXSS($user->infos['real_name']); ?> (<?php echo Filters::noXSS($user->infos['user_name']); ?>)</em>
+				</a>
+				<div id="permissions">
+					<?php echo tpl_draw_perms($user->perms); ?>
+
+				</div>
+			</li>
+			<li>
+				<a id="lastsearchlink" href="#" accesskey="m" onclick="showhidestuff('mysearches');return false;" class="inactive"><?php echo Filters::noXSS(L('mysearch')); ?></a>
+				<div id="mysearches">
+					<?php $this->display('links.searches.tpl'); ?>
+				</div>
+			</li>
+		<?php if ($user->perms('is_admin')): ?>
+			<li>
+				<a id="optionslink"
+					<?php if(isset($_GET['do']) and $_GET['do'] == 'admin'): ?> class="active" <?php endif; ?>
+					 href="<?php echo Filters::noXSS(CreateURL('admin', 'prefs')); ?>"><?php echo Filters::noXSS(L('admintoolbox')); ?></a>
+			</li>
+		<?php endif; ?>
+		
+			<li>
+				<a id="logoutlink" href="<?php echo Filters::noXSS(CreateURL('logout', null)); ?>"
+					accesskey="l"><?php echo Filters::noXSS(L('logout')); ?></a>
+			</li>
+			<?php if (isset($_SESSION['was_locked'])): ?>
+			<li>
+				<span id="locked"><?php echo Filters::noXSS(L('accountwaslocked')); ?></span>
+			</li>
+			<?php elseif (isset($_SESSION['login_attempts']) && $_SESSION['login_attempts'] > 0): ?>
+			<li>
+				<span id="locked"><?php echo Filters::noXSS(sprintf(L('failedattempts'), $_SESSION['login_attempts'])); ?></span>
+			</li>
+			<?php endif; unset($_SESSION['login_attempts'], $_SESSION['was_locked']); ?>
+		
+		
+<?php endif; ?>
+</ul>
+</div>
+
+<div id="pm-menu">
+
+	<ul id="pm-menu-list">
+		<!-- Only show the user the overview tab if they are part of some projects -->
+		<?php if ( count($fs->projects) ) { ?>
+			<li class="first">
+				<a id="toplevellink"
+					<?php if(isset($_GET['do']) and $_GET['do'] == 'toplevel'): ?> class="active" <?php endif; ?>
+				 href="<?php echo Filters::noXSS(CreateURL('toplevel', $proj->id)); ?>"><?php echo Filters::noXSS(L('overview')); ?></a>
+			</li>
+		<?php } ?>
+
+
+		<li>
+		<a id="homelink"
+				<?php if(!isset($_GET['do']) or $_GET['do'] == 'index'): ?> class="active" <?php endif; ?>
+				href="<?php echo Filters::noXSS(CreateURL('project', $proj->id, null, array('do' => 'index'))); ?>"><?php echo Filters::noXSS(L('tasklist')); ?></a>
+		</li>
+
+		<?php if ($proj->id && $user->perms('open_new_tasks')): ?>
+			<li>
+			<a id="newtasklink" href="<?php echo Filters::noXSS(CreateURL('newtask', $proj->id)); ?>"
+				<?php if(isset($_GET['do']) and $_GET['do'] == 'newtask'): ?> class="active" <?php endif; ?>
+				accesskey="a"><?php echo Filters::noXSS(L('addnewtask')); ?></a>
+			</li>
+			<li>
+			<a id="newmultitaskslink" href="<?php echo Filters::noXSS(CreateURL('newmultitasks', $proj->id)); ?>"
+				<?php if(isset($_GET['do']) and $_GET['do'] == 'newmultitasks'): ?> class="active" <?php endif; ?>
+				accesskey="a"><?php echo Filters::noXSS(L('addmultipletasks')); ?></a>
+			</li>
+		<?php elseif ($proj->id && $user->isAnon() && $proj->prefs['anon_open']): ?>
+			<li>
+				<a id="anonopen"
+				<?php if(isset($_GET['do']) and $_GET['do'] == 'newtask'): ?> class="active" <?php endif; ?>
+					href="?do=newtask&amp;project=<?php echo Filters::noXSS($proj->id); ?>"><?php echo Filters::noXSS(L('opentaskanon')); ?></a>
+			</li>
+		<?php endif; ?>
+
+		<?php if ($user->perms('view_reports')): ?>
+			<li>
+			<a id="reportslink"
+				<?php if(isset($_GET['do']) and $_GET['do'] == 'reports'): ?> class="active" <?php endif; ?>
+				 href="<?php echo Filters::noXSS(CreateURL('reports', null, null, array('project' => $proj->id))); ?>"><?php echo Filters::noXSS(L('reports')); ?></a>
+			</li>
+		<?php endif; ?>
+
+		<?php if ($proj->id): ?>
+		<li>
+		<a id="roadmaplink"
+				<?php if(isset($_GET['do']) and $_GET['do'] == 'roadmap'): ?> class="active" <?php endif; ?>
+				href="<?php echo Filters::noXSS(CreateURL('roadmap', $proj->id)); ?>"><?php echo Filters::noXSS(L('roadmap')); ?></a>
+		</li>
+		<?php endif; ?>
+
+		<?php if ($proj->id && $user->perms('manage_project')): ?>
+			<li>
+			<a id="projectslink"
+				<?php if(isset($_GET['do']) and $_GET['do'] == 'pm'): ?> class="active" <?php endif; ?>
+				href="<?php echo Filters::noXSS(CreateURL('pm', 'prefs', $proj->id)); ?>"><?php echo Filters::noXSS(L('manageproject')); ?></a>
+			</li>
+		<?php endif; ?>
+
+		<?php if ($proj->id && isset($pm_pendingreq_num) && $pm_pendingreq_num): ?>
+			<li>
+				<a class="pendingreq attention"
+					 href="<?php echo Filters::noXSS(CreateURL('pm', 'pendingreq', $proj->id)); ?>"><?php echo Filters::noXSS($pm_pendingreq_num); ?> <?php echo Filters::noXSS(L('pendingreq')); ?></a>
+			</li>
+		<?php endif; ?>
+		<?php if (!$proj->id && $user->perms('is_admin') && isset($admin_pendingreq_num) && $admin_pendingreq_num): ?>
+			<li>
+				<a class="pendingreq attention"
+					href="<?php echo Filters::noXSS(CreateURL('admin', 'userrequest')); ?>"><?php echo Filters::noXSS($admin_pendingreq_num); ?> <?php echo Filters::noXSS(L('adminrequestswaiting')); ?></a>
+			</li>
+		<?php endif; ?>
+		
+		<li id="pmcontrol">
+			<div id="projectselector">
+				<form id="projectselectorform" action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+					 <div>
+						<select name="project" onchange="document.getElementById('projectselectorform').submit()">
+							<?php echo tpl_options(array_merge(array(0 => L('allprojects')), $fs->projects), $proj->id); ?>
+
+						</select>
+						<button type="submit"><?php echo Filters::noXSS(L('switch')); ?></button>
+						<input type="hidden" name="do" value="<?php echo Filters::noXSS($do); ?>" />
+						<input type="hidden" value="1" name="switch" />
+						<?php $check = array('area', 'id');
+									if ($do == 'reports') {
+										$check = array_merge($check, array('open', 'close', 'edit', 'assign', 'repdate', 'comments', 'attachments',
+																		'related', 'notifications', 'reminders', 'within', 'duein', 'fromdate', 'todate'));
+									}
+									foreach ($check as $key):
+									if (Get::has($key)): ?>
+						<input type="hidden" name="<?php echo Filters::noXSS($key); ?>" value="<?php echo Filters::noXSS(Get::val($key)); ?>" />
+						<?php endif;
+									endforeach; ?>
+					</div>
+				</form>	
+			</div>
+			<div id="showtask">
+				<form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+					<div>
+						<button type="submit"><?php echo Filters::noXSS(L('showtask')); ?> #</button>
+						<input id="task_id" name="show_task" class="text" type="text" size="10" accesskey="t" />
+					</div>
+				</form>
+			</div>
+
+		</li>
+		
+	</ul>
+	
+</div>
diff --git a/templates/loginbox.tpl b/templates/loginbox.tpl
new file mode 100644
index 0000000..71ffd82
--- /dev/null
+++ b/templates/loginbox.tpl
@@ -0,0 +1,54 @@
+<form id="login" action="<?php echo Filters::noXSS($baseurl); ?>index.php?do=authenticate" method="post">
+<div id="login_input">
+  <label for="lbl_user_name"><?php echo Filters::noXSS(L('username')); ?></label>
+  <input class="text" type="text" id="lbl_user_name" name="user_name" size="17" maxlength="30" />
+  
+  <label for="lbl_password"><?php echo Filters::noXSS(L('password')); ?></label>
+  <input class="password" type="password" id="lbl_password" name="password" size="17" maxlength="30" />
+  
+  <input type="hidden" name="return_to" value="<?php echo Filters::noXSS($_SERVER['REQUEST_URI']); ?>" />
+
+  <input type="submit" value="<?php echo Filters::noXSS(L('login')); ?>" name="login" id="login_button" />
+</div>
+<div id="login_links">
+    <div id="login_hidelink">
+        <a href="#" onclick="return toggleLoginBox(document.getElementById('show_loginbox'));"><small>hide</small></a>
+    </div>
+    <div class="remember_me">
+        <label for="lbl_remember"><?php echo Filters::noXSS(L('rememberme')); ?></label>
+        <input type="checkbox" id="lbl_remember" name="remember_login" />
+    </div>
+    <?php $activeclass = ' class="active" '; ?>
+    <?php if ($user->isAnon() && $fs->prefs['anon_reg']): ?>
+      <a id="registerlink"
+        <?php if(isset($_GET['do']) and $_GET['do'] == 'register') echo $activeclass; ?>
+        href="<?php echo Filters::noXSS(CreateURL('register','')); ?>"><?php echo Filters::noXSS(L('register')); ?></a>
+    <?php endif; ?>
+    <?php if ($user->isAnon() && !$fs->prefs['disable_lostpw']): ?>
+    <?php if ($user->isAnon() && $fs->prefs['user_notify']): ?>
+      <a id="forgotlink"
+        <?php if(isset($_GET['do']) and $_GET['do'] == 'lostpw') echo $activeclass; ?>
+        href="<?php echo Filters::noXSS(CreateURL('lostpw','')); ?>"><?php echo Filters::noXSS(L('lostpassword')); ?></a>
+    <?php else: ?>
+      <a id="forgotlink" href="mailto:<?php echo Filters::noXSS(implode(',', $admin_emails)); ?>?subject=<?php echo Filters::noXSS(rawurlencode(L('lostpwforfs'))); ?>&amp;body=<?php echo Filters::noXSS(rawurlencode(L('lostpwmsg1'))); ?><?php echo Filters::noXSS($baseurl); ?><?php echo Filters::noXSS(rawurlencode(L('lostpwmsg2'))); ?><?php
+              if(isset($_SESSION['failed_login'])):
+              ?><?php echo Filters::noXSS(rawurlencode($_SESSION['failed_login'])); ?><?php
+              else:
+              ?>&lt;<?php echo Filters::noXSS(rawurlencode(L('yourusername'))); ?>&gt;<?php
+              endif;
+              ?><?php echo Filters::noXSS(rawurlencode(L('regards'))); ?>"><?php echo Filters::noXSS(L('lostpassword')); ?></a>
+      <script type="text/javascript">var link = document.getElementById('forgotlink');link.href=link.href.replace(/#/g,"@");</script>
+    <?php endif; ?>
+    <?php endif; ?>
+</div>
+<?php $return = '&return_to=' . base64_encode($_SERVER['REQUEST_URI']); 
+      $providers = $conf['oauth']['enabled'];
+?>
+<div id="login_oauth">
+    <?php foreach($providers as $provider): ?>
+    <a class="oauth btn-<?php echo $provider; ?>" href="index.php?do=oauth&provider=<?php echo $provider . $return; ?>">
+        <i class="fa fa-<?php echo $provider; ?>"></i> Sign in with <?php echo ucfirst($provider); ?>
+    </a>
+    <?php endforeach; ?>
+    
+</form>
diff --git a/templates/lostpw.step1.tpl b/templates/lostpw.step1.tpl
new file mode 100644
index 0000000..03208b0
--- /dev/null
+++ b/templates/lostpw.step1.tpl
@@ -0,0 +1,13 @@
+<h3><?php echo Filters::noXSS(L('lostpw')); ?></h3>
+<div class="box">
+    <p><?php echo Filters::noXSS(L('lostpwexplain')); ?></p>
+
+    <form action="<?php echo Filters::noXSS(CreateUrl('lostpw')); ?>" method="post">
+        <p><b><?php echo Filters::noXSS(L('username')); ?></b>
+
+        <input type="hidden" name="action" value="lostpw.sendmagic" />
+        <input class="text" type="text" value="<?php echo Filters::noXSS(Req::val('user_name')); ?>" name="user_name" size="20" maxlength="20" />
+        <button type="submit"><?php echo Filters::noXSS(L('sendlink')); ?></button>
+        </p>
+    </form>
+</div>
diff --git a/templates/lostpw.step2.tpl b/templates/lostpw.step2.tpl
new file mode 100644
index 0000000..8ca1e52
--- /dev/null
+++ b/templates/lostpw.step2.tpl
@@ -0,0 +1,24 @@
+<h3><?php echo Filters::noXSS(L('changepass')); ?></h3>
+<div class="box">
+
+    <form action="<?php echo Filters::noXSS(CreateUrl('lostpw')); ?>" method="post">
+    <ul class="form_elements wide">
+      <li>
+        <label for="pass1"><?php echo Filters::noXSS(L('changepass')); ?></label>
+        <input class="password" id="pass1" type="password" value="<?php echo Filters::noXSS(Req::val('pass1')); ?>" name="pass1" size="20" />
+      </li>
+
+      <li>
+        <label for="pass2"><?php echo Filters::noXSS(L('confirmpass')); ?></label>
+        <input class="password" id="pass2" type="password" value="<?php echo Filters::noXSS(Req::val('pass2')); ?>" name="pass2" size="20" />
+      </li>
+    </ul>
+      
+      <div>
+        <input type="hidden" name="action" value="lostpw.chpass" />
+        <input type="hidden" name="magic_url" value="<?php echo Filters::noXSS(Req::val('magic_url')); ?>" />
+        <button type="submit"><?php echo Filters::noXSS(L('savenewpass')); ?></button>
+      </div>
+    </form>
+</div>
+
diff --git a/templates/myprofile.tpl b/templates/myprofile.tpl
new file mode 100644
index 0000000..21960d2
--- /dev/null
+++ b/templates/myprofile.tpl
@@ -0,0 +1,4 @@
+<h3><?php echo Filters::noXSS(L('editmydetails')); ?></h3>
+<div class="box">
+<?php $this->display('common.profile.tpl'); ?>
+</div>
\ No newline at end of file
diff --git a/templates/newmultitasks.tpl b/templates/newmultitasks.tpl
new file mode 100644
index 0000000..2cbca36
--- /dev/null
+++ b/templates/newmultitasks.tpl
@@ -0,0 +1,273 @@
+<?php
+    if (!isset($supertask_id)) {
+        $supertask_id = 0;
+    }
+    $field_num = 3;
+?>
+<!-- Grab fields wanted for this project so we can only show those we want -->
+<?php $fields = explode( ' ', $proj->prefs['visible_fields'] ); ?>
+
+<div id="intromessage">Tips for bulk importing:<br>
+
+    1. Copy and paste from an excel spreadsheet or CSV by pasting one entire column.<br>
+    2. Currently you can only paste Summary and Details.<br>
+    3. There are suggestions when you assign to someone, and to no-one if there is no matched name.
+
+</div>
+<form enctype="multipart/form-data" action="<?php echo Filters::noXSS(CreateUrl('newmultitasks', $proj->id, $supertask_id)); ?>" method="post">
+  <input type="hidden" name="supertask_id" value="<?php echo Filters::noXSS($supertask_id); ?>" />
+  <input type="hidden" name="action" value="newmultitasks.newmultitasks" />
+
+    <table class="list">
+       <thead>
+       <tr>
+	 <th></th>
+         <?php if (in_array('tasktype', $fields)) { ?><th><?php echo Filters::noXSS(L('tasktype')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('category', $fields)) { ?><th><?php echo Filters::noXSS(L('category')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('status', $fields)) { ?><th><?php echo Filters::noXSS(L('status')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('os', $fields)) { ?><th><?php echo Filters::noXSS(L('operatingsystem')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('severity', $fields)) { ?><th><?php echo Filters::noXSS(L('severity')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('priority', $fields)) { ?><th><?php echo Filters::noXSS(L('priority')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('reportedin', $fields)) { ?><th><?php echo Filters::noXSS(L('reportedversion')); ?></th><?php $field_num++;} ?>
+         <?php if (in_array('dueversion', $fields)) { ?><th><?php echo Filters::noXSS(L('dueinversion')); ?></th><?php $field_num++;} ?>
+	 <?php if ($user->perms('modify_all_tasks')): ?><?php if (in_array('assignedto', $fields)) { ?><th><?php echo Filters::noXSS(L('assignedto')); ?></th><?php $field_num++;} ?><?php endif; ?>
+         <th><?php echo Filters::noXSS(L('summary')); ?></th>
+         <th><?php echo Filters::noXSS(L('details')); ?></th>
+       </tr>
+     </thead>
+     <tbody id="table">
+      <button class="button positive main" accesskey="s" type="button" onClick="Apply()">Apply first line</button>
+      <tr id="row">
+	<td><input type="image" src="themes/CleanFS/img/red/x_alt_24x24.png" onClick="removeRow(this);return false;"/></td>
+        <?php if (in_array('tasktype', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select name="task_type[]" id="tasktype">
+              <?php echo tpl_options($proj->listTaskTypes(), Req::val('task_type')); ?>
+
+            </select>
+	</td>
+
+          <!-- Category-->
+	<?php if (in_array('category', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select class="adminlist" name="product_category[]" id="category">
+              <?php echo tpl_options($proj->listCategories(), Req::val('product_category')); ?>
+
+            </select>
+	</td>
+
+          <!-- Status-->
+	<?php if (in_array('status', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select id="status" name="item_status[]" <?php echo tpl_disableif(!$user->perms('modify_all_tasks')); ?>>
+              <?php echo tpl_options($proj->listTaskStatuses(), Req::val('item_status', ($user->perms('modify_all_tasks') ? STATUS_NEW : STATUS_UNCONFIRMED))); ?>
+            </select>
+	</td>
+
+          <!-- OS-->
+	<?php if (in_array('os', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select id="os" name="operating_system[]">
+              <?php echo tpl_options($proj->listOs(), Req::val('operating_system')); ?>
+
+            </select>
+	</td>
+
+          <!-- Severity-->
+	<?php if (in_array('severity', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select id="severity" class="adminlist" name="task_severity[]">
+              <?php echo tpl_options($fs->severities, Req::val('task_severity', 2)); ?>
+
+            </select>
+	</td>
+
+          <!-- Priority-->
+	<?php if (in_array('priority', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select id="priority" name="task_priority[]" <?php echo tpl_disableif(!$user->perms('modify_all_tasks')); ?>>
+              <?php echo tpl_options($fs->priorities, Req::val('task_priority', 4)); ?>
+            </select>
+	</td>
+
+          <!-- Reported Version-->
+	<?php if (in_array('reportedin', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select class="adminlist" name="product_version[]" id="reportedver">
+              <?php echo tpl_options($proj->listVersions(false, 2), Req::val('product_version')); ?>
+
+            </select>
+	</td>
+
+          <!-- Due Version -->
+	<?php if (in_array('dueversion', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } ?>
+            <select id="dueversion" name="closedby_version[]" <?php echo tpl_disableif(!$user->perms('modify_all_tasks')); ?>>
+              <option value="0"><?php echo Filters::noXSS(L('undecided')); ?></option>
+              <?php echo tpl_options($proj->listVersions(false, 3),$proj->prefs['default_due_version'], false); ?>
+            </select>
+	</td>
+
+          <!-- Assigned To -->
+	<?php if ($user->perms('modify_all_tasks')){ ?><?php if (in_array('assignedto', $fields)) { ?>
+	<td>
+	<?php } else { ?>
+	<td style="display:none">
+	<?php } echo tpl_userselect('assigned_to[0]', Req::val('assigned_to[0]'), 'find_user_0'); ?>
+	</td>
+	<?php } ?>
+	<td>
+	    <input type="text" class="text" size="30" id="summary" name="item_summary[]" onPaste="pasteMultiLines(this, event);return false"/>
+	</td>
+	<td>
+	    <input type="text" class="text" size="20" id="details" name="detailed_desc[]" onkeydown="return TabandCreate(this, event);" onPaste="pasteMultiLines(this, event);return false"/>
+	</td>
+      </tr>
+
+      <tr>
+        <td colspan="<?php echo $field_num-2;?>"></td>
+        <td class="buttons">
+          <button class="button positive main" accesskey="s" type="button" onClick="createRow('','')">Add more rows</button>
+        </td>
+        <td class="buttons">
+          <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+          <button class="button positive main" accesskey="s" type="submit">Add tasks</button>
+        </td>
+      </tr>
+
+
+     </tbody>
+  </table>
+  <script type="text/javascript">
+
+	var index = 0;
+	function createRow(summary, details)
+	{
+		index++;
+		var table = document.getElementById("table");
+		var rows = table.getElementsByTagName("tr");
+		var clone = rows[0].cloneNode(true);
+
+		var tds = clone.getElementsByTagName("td");
+		var length = tds.length;
+		tds[length-2].getElementsByTagName("input")[0].value = summary;
+		tds[length-1].getElementsByTagName("input")[0].value = details;
+		tds[length-3].getElementsByTagName("input")[0].value = "";
+		tds[length-3].getElementsByTagName("script")[0].innerHTML = "";
+		var res = tds[length-3].innerHTML.replace(/assigned_to\[0\]/g, "assigned_to[" + index + "]");
+		res = res.replace(/find_user_0/g, "find_user_" + index);
+		tds[length-3].innerHTML = res;
+		table.insertBefore(clone, table.lastElementChild);
+		showstuff("assigned_to[" + index + "]_complete");
+		new Ajax.Autocompleter(tds[length-3].getElementsByTagName("input")[0].id, tds[length-3].getElementsByTagName("span")[0].id, "<?php echo Filters::noXSS($baseurl); ?>js/callbacks/usersearch.php", null);
+	}
+	function removeRow(elem)
+	{
+		var table = document.getElementById("table");
+		var rows = table.getElementsByTagName("tr");
+		var length = rows.length;
+		if(length <= 2)
+			return false;
+		for(var i = 0; i < length -1; i++)
+		{
+			if(rows[i] == elem.parentNode.parentNode) {
+				table.deleteRow(i);
+				break;
+			}
+		}
+	}
+	function pasteMultiLines(elem, e)
+	{
+
+		if(e && e.clipboardData && e.clipboardData.getData) {
+			var strs = e.clipboardData.getData("text/plain").split("\n");
+			var table = document.getElementById("table");
+			var rows = table.getElementsByTagName("tr");
+			for(var i = 0; i < rows.length-1; i++)
+			{
+				if(rows[i] == elem.parentNode.parentNode)
+					break;
+			}
+			var index;
+			if(elem.id == "summary")
+				index = 2;
+			else
+				index = 1;
+			var k = 0;
+			for(var j = i; j < rows.length-1 && k < strs.length; j++, k++)
+			{
+				var tds = rows[j].getElementsByTagName("td");
+				var length = tds.length;
+				tds[length-index].getElementsByTagName("input")[0].value = strs[k];
+			}
+			for(; k < strs.length; k++)
+			{
+				if(index == 2)
+					createRow(strs[k], "");
+				else
+					createRow("", strs[k]);
+			}
+		}
+	}
+	function Apply()
+	{
+		var table = document.getElementById("table");
+		var rows = table.getElementsByTagName("tr");
+		var fields = rows[0].getElementsByTagName("td");
+		for(var i = 1; i < rows.length-1; i++)
+		{
+			var tds = rows[i].getElementsByTagName("td");
+			for(var j = 1; j < tds.length; j++)
+			{
+				var input = tds[j].getElementsByTagName("input");
+				var select = tds[j].getElementsByTagName("select");
+				if(input != null && input.length > 0)
+				{
+					input[0].value = fields[j].getElementsByTagName("input")[0].value;
+				}
+				if(select != null && select.length > 0)
+				{
+					select[0].value = fields[j].getElementsByTagName("select")[0].value;
+				}
+			}
+		}
+	}
+	function TabandCreate(elem, e)
+	{
+		if(e.keyCode != 9)
+			return true;
+		var table = document.getElementById("table");
+		var rows = table.getElementsByTagName("tr");
+		var length = rows.length;
+		var parent = elem.parentNode.parentNode;
+		if(parent == rows[length-2])
+			createRow('','');
+		parent.nextElementSibling.getElementsByTagName("input")[1].focus();
+		return false;
+	}
+  </script>
+</form>
diff --git a/templates/newtask.tpl b/templates/newtask.tpl
new file mode 100644
index 0000000..edd6a66
--- /dev/null
+++ b/templates/newtask.tpl
@@ -0,0 +1,292 @@
+<!--<h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> :: <?php echo Filters::noXSS(L('newtask')); ?></h3>-->
+<?php
+    if (!isset($supertask_id)) {
+        $supertask_id = 0;
+    }
+?>
+  <script type="text/javascript">
+	function checkContent()
+	{//I'm thinking about changing javascript to jquery
+		var instance;
+		for(instance in CKEDITOR.instances)
+			CKEDITOR.instances[instance].updateElement();
+		var summary = document.getElementById("itemsummary").value;
+		if(summary.trim().length == 0)
+			return true;
+		var detail = document.getElementById("details").value;
+		var xmlHttp = new XMLHttpRequest();
+		xmlHttp.open("POST", "<?php echo Filters::noXSS($baseurl); ?>js/callbacks/searchtask.php", false);
+		xmlHttp.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+		xmlHttp.send("summary=" + summary + "&detail=" + detail);
+		if(xmlHttp.status === 200)
+		{
+			if(xmlHttp.responseText > 0)
+			{
+				var res = confirm("There is already a similar task, do you still want to create?");
+				return res;
+			}
+			return true;
+		}
+		return false;
+	}
+  </script>
+<form enctype="multipart/form-data" action="<?php echo Filters::noXSS(CreateUrl('newtask', $proj->id, $supertask_id)); ?>" method="post" onsubmit="return checkContent()">
+  <input type="hidden" name="supertask_id" value="<?php echo Filters::noXSS($supertask_id); ?>" />
+  <div id="actionbar">
+
+    <button class="button positive main" accesskey="s" type="submit"><?php echo Filters::noXSS(L('addthistask')); ?></button>
+    <div class="clear"></div>
+  </div>
+
+  <!-- Grab fields wanted for this project so we can only show those we want -->
+  <?php $fields = explode( ' ', $proj->prefs['visible_fields'] ); ?>
+
+  <div id="taskdetails">
+      <div id="taskfields">
+        <ul class="form_elements slim">
+
+          <!-- Task Type -->
+          <?php if (in_array('tasktype', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="tasktype"><?php echo Filters::noXSS(L('tasktype')); ?></label>
+            <select name="task_type" id="tasktype">
+              <?php echo tpl_options($proj->listTaskTypes(), Req::val('task_type')); ?>
+
+            </select>
+          </li>
+
+          <!-- Category -->
+          <?php if (in_array('category', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="category"><?php echo Filters::noXSS(L('category')); ?></label>
+            <select class="adminlist" name="product_category" id="category">
+              <?php echo tpl_options($proj->listCategories(), Req::val('product_category')); ?>
+
+            </select>
+          </li>
+
+          <!-- Status -->
+          <?php if (in_array('status', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="status"><?php echo Filters::noXSS(L('status')); ?></label>
+            <select id="status" name="item_status" <?php echo tpl_disableif(!$user->perms('modify_all_tasks')); ?>>
+              <?php echo tpl_options($proj->listTaskStatuses(), Req::val('item_status', ($user->perms('modify_all_tasks') ? STATUS_NEW : STATUS_UNCONFIRMED))); ?>
+
+            </select>
+          </li>
+
+          <?php if ($user->perms('modify_all_tasks')): ?>
+          <!-- Assigned To -->
+          <?php if (in_array('assignedto', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label><?php echo Filters::noXSS(L('assignedto')); ?></label>
+            <?php if ($user->perms('modify_all_tasks')): ?>
+            <?php $this->display('common.multiuserselect.tpl'); ?>
+            <?php endif; ?>
+          </li>
+          <?php endif; ?>
+
+          <!-- os -->
+          <?php if (in_array('os', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="os"><?php echo Filters::noXSS(L('operatingsystem')); ?></label>
+            <select id="os" name="operating_system">
+              <?php echo tpl_options($proj->listOs(), Req::val('operating_system')); ?>
+
+            </select>
+          </li>
+
+          <!-- Severity -->
+          <?php if (in_array('severity', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="severity"><?php echo Filters::noXSS(L('severity')); ?></label>
+            <select onchange="getElementById('edit_summary').className = 'summary severity' + this.value;
+                              getElementById('itemsummary').className = 'text severity' + this.value;"
+                              id="severity" class="adminlist" name="task_severity">
+              <?php echo tpl_options($fs->severities, Req::val('task_severity', 2)); ?>
+
+            </select>
+          </li>
+
+          <!-- Priority-->
+          <?php if (in_array('priority', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="priority"><?php echo Filters::noXSS(L('priority')); ?></label>
+            <select id="priority" name="task_priority" <?php echo tpl_disableif(!$user->perms('modify_all_tasks')); ?>>
+              <?php echo tpl_options($fs->priorities, Req::val('task_priority', 4)); ?>
+
+            </select>
+          </li>
+
+          <!-- Reported Version-->
+          <?php if (in_array('reportedin', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="reportedver"><?php echo Filters::noXSS(L('reportedversion')); ?></label>
+            <select class="adminlist" name="product_version" id="reportedver">
+              <?php echo tpl_options($proj->listVersions(false, 2), Req::val('product_version')); ?>
+
+            </select>
+          </li>
+
+          <!-- Due Version -->
+          <?php if (in_array('dueversion', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="dueversion"><?php echo Filters::noXSS(L('dueinversion')); ?></label>
+            <select id="dueversion" name="closedby_version" <?php echo tpl_disableif(!$user->perms('modify_all_tasks')); ?>>
+              <option value="0"><?php echo Filters::noXSS(L('undecided')); ?></option>
+              <?php echo tpl_options($proj->listVersions(false, 3),$proj->prefs['default_due_version'], false); ?>
+
+            </select>
+          </li>
+
+          <?php if ($user->perms('modify_all_tasks')): ?>
+          <!-- Due Date -->
+          <?php if (in_array('duedate', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="due_date"><?php echo Filters::noXSS(L('duedate')); ?></label>
+            <?php echo tpl_datepicker('due_date', '', Req::val('due_date')); ?>
+
+          </li>
+          <?php endif; ?>
+
+            <?php if($proj->prefs['use_effort_tracking']) {
+            ?>
+            <li style="...">
+                <label for="estimatedeffort"><?php echo Filters::noXSS(L('estimatedeffort')); ?></label>
+                <input id="estimated_effort" name="estimated_effort" class="text" type="text" size="5" maxlength="100" value="0" />
+                <?php echo Filters::noXSS(L('hours')); ?>
+
+            </li>
+            <?php } ?>
+
+          <?php if ($user->perms('manage_project')): ?>
+          <!-- Private -->
+          <?php if (in_array('private', $fields)) { ?>
+            <li>
+          <?php } else { ?>
+            <li style="display:none">
+          <?php } ?>
+            <label for="private"><?php echo Filters::noXSS(L('private')); ?></label>
+            <?php echo tpl_checkbox('mark_private', Req::val('mark_private', 0), 'private'); ?>
+
+          </li>
+          <?php endif; ?>
+        </ul>
+      </div>
+
+      <div id="taskdetailsfull">
+        <!--<h3 class="taskdesc"><?php echo Filters::noXSS(L('details')); ?></h3>-->
+        <h2 class="severity<?php echo Filters::noXSS(Req::val('task_severity', 2)); ?> summary" id="edit_summary">
+          <label for="itemsummary"><?php echo Filters::noXSS(L('summary')); ?></label>
+          <input id="itemsummary" class="text severity<?php echo Filters::noXSS(Req::val('task_severity', 2)); ?>" type="text" value="<?php echo Filters::noXSS(Req::val('item_summary')); ?>"
+            name="item_summary" size="80" maxlength="100" />
+
+          <br/>
+          <label for="tags">Tags:</label>
+          <input id="tags" class="text severity<?php echo Filters::noXSS(Req::val('task_severity', 2)); ?>" type="text" value="<?php echo Filters::noXSS(Req::val('item_summary')); ?>"
+            name="tags" size="80" maxlength="100" /> <!--hyz!!!!! -->
+
+        </h2>
+
+        <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+        <div class="hide preview" id="preview"></div>
+        <?php endif; ?>
+        <?php echo TextFormatter::textarea('detailed_desc', 15, 70, array('id' => 'details'), Req::val('detailed_desc', $proj->prefs['default_task'])); ?>
+
+
+      <p class="buttons">
+          <?php if ($user->isAnon()): ?>
+          <label class="inline" for="anon_email"><?php echo Filters::noXSS(L('youremail')); ?></label><input type="text" class="text" id="anon_email" name="anon_email" size="30"  value="<?php echo Filters::noXSS(Req::val('anon_email')); ?>" /><br />
+          <?php endif; ?>
+          <?php if (!$user->perms('modify_all_tasks')): ?>
+          <input type="hidden" name="item_status"   value="1" />
+          <input type="hidden" name="task_priority" value="2" />
+          <?php endif; ?>
+          <input type="hidden" name="action" value="newtask.newtask" />
+          <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+          <!--<button accesskey="s" type="submit"><?php echo Filters::noXSS(L('addthistask')); ?></button>-->
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <button tabindex="9" type="button" onclick="showPreview('details', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+          <?php endif; ?>
+
+          <?php if (!$user->isAnon()): ?>
+          &nbsp;&nbsp;<input class="text" type="checkbox" id="notifyme" name="notifyme"
+          value="1" checked="checked" />&nbsp;<label class="inline left" for="notifyme"><?php echo Filters::noXSS(L('notifyme')); ?></label>
+          <?php endif; ?>
+      </p>
+
+        <?php if ($user->perms('create_attachments')): ?>
+        <div id="uploadfilebox">
+          <span style="display: none"><?php // this span is shown/copied in javascript when adding files ?>
+            <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+              <a href="javascript://" tabindex="6" onclick="removeUploadField(this, 'uploadfilebox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+          </span>
+          <noscript>
+            <span>
+              <input tabindex="5" class="file" type="file" size="55" name="userfile[]" />
+                <a href="javascript://" tabindex="6" onclick="removeUploadField(this, 'uploadfilebox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+            </span>
+          </noscript>
+        </div>
+        <button id="uploadfilebox_attachafile" tabindex="7" type="button" onclick="addUploadFields('uploadfilebox')">
+          <?php echo Filters::noXSS(L('uploadafile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+        </button>
+        <button id="uploadfilebox_attachanotherfile" tabindex="7" style="display: none" type="button" onclick="addUploadFields('uploadfilebox')">
+           <?php echo Filters::noXSS(L('attachanotherfile')); ?> (<?php echo Filters::noXSS(L('max')); ?> <?php echo Filters::noXSS($fs->max_file_size); ?> <?php echo Filters::noXSS(L('MiB')); ?>)
+        </button>
+
+        <div id="addlinkbox">
+    <span style="display: none">
+	 <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	 <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+    </span>
+    <noscript>
+	 <span>
+	       <input tabindex="8" class="text" type="text" size="28" maxlength="100" name="userlink[]" />
+	       <a href="javascript://" tabindex="9" onclick="removeLinkField(this, 'addlinkbox');"><?php echo Filters::noXSS(L('remove')); ?></a><br />
+	 </span>
+    </noscript>
+</div>
+<button id="addlinkbox_addalink" tabindex="10" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addalink')); ?>
+</button>
+<button id="addlinkbox_addanotherlink" tabindex="10" style="display: none" type="button" onclick="addLinkField('addlinkbox')">
+	<?php echo Filters::noXSS(L('addanotherlink')); ?>
+</button>
+        <?php endif; ?>
+
+      </div>
+
+    <div class="clear"></div>
+  </div>
+</form>
diff --git a/templates/pm.cat.tpl b/templates/pm.cat.tpl
new file mode 100644
index 0000000..b21cf4c
--- /dev/null
+++ b/templates/pm.cat.tpl
@@ -0,0 +1,4 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('catlisted')); ?></h3>
+  <?php $this->display('common.cat.tpl'); ?>
+</div>
diff --git a/templates/pm.editgroup.tpl b/templates/pm.editgroup.tpl
new file mode 100644
index 0000000..39b00af
--- /dev/null
+++ b/templates/pm.editgroup.tpl
@@ -0,0 +1,4 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('pmtoolbox')); ?> :: <?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('editgroup')); ?></h3>
+  <?php $this->display('common.editgroup.tpl'); ?>
+</div>
diff --git a/templates/pm.groups.tpl b/templates/pm.groups.tpl
new file mode 100644
index 0000000..5f0fee1
--- /dev/null
+++ b/templates/pm.groups.tpl
@@ -0,0 +1,39 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('groupmanage')); ?></h3>
+  <?php if ($user->perms('is_admin')): ?>
+  <p>
+    <!--<img src="<?php echo Filters::noXSS($this->get_image('personal')); ?>" alt="" class="middle" />-->
+    <a href="<?php echo Filters::noXSS(CreateURL('admin', 'newuser', $proj->id)); ?>"><?php echo Filters::noXSS(L('newuser')); ?></a>
+  </p>
+  <?php endif; ?>
+  <p>
+    <!--<img src="<?php echo Filters::noXSS($this->get_image('kuser')); ?>" alt="" class="middle" />-->
+    <a href="<?php echo Filters::noXSS(CreateURL('pm', 'newgroup', $proj->id)); ?>"><?php echo Filters::noXSS(L('newgroup')); ?></a>
+  </p>
+  
+  <div class="groupedit">
+  <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+    <ul class="form_elements">
+      <li>
+        <label for="selectgroup"><?php echo Filters::noXSS(L('editgroup')); ?></label>
+        <select name="id" id="selectgroup"><?php echo tpl_options(Flyspray::ListGroups($proj->id)); ?></select>
+        <button type="submit"><?php echo Filters::noXSS(L('edit')); ?></button>
+        <input type="hidden" name="do" value="pm" />
+        <input type="hidden" name="area" value="editgroup" />
+      </li>
+    </ul>
+  </form>
+  
+  <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+    <ul class="form_elements">
+      <li>
+        <label for="edit_user"><?php echo Filters::noXSS(L('edituser')); ?></label>
+        <?php echo tpl_userselect('user_name', '', 'edit_user'); ?>               
+        <button type="submit"><?php echo Filters::noXSS(L('edit')); ?></button>
+  
+        <input type="hidden" name="do" value="user" />
+      </li>
+    </ul>
+  </form>
+  </div>
+</div>
diff --git a/templates/pm.menu.tpl b/templates/pm.menu.tpl
new file mode 100644
index 0000000..9291393
--- /dev/null
+++ b/templates/pm.menu.tpl
@@ -0,0 +1,31 @@
+<?php $activeclass = ' class="active" '; ?>
+
+<div id="toolboxmenu">
+  <a id="projprefslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'prefs') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'prefs',      $proj->id)); ?>"><?php echo Filters::noXSS(L('preferences')); ?></a>
+  <a id="projuglink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'groups') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'groups',     $proj->id)); ?>"><?php echo Filters::noXSS(L('usergroups')); ?></a>
+  <a id="projttlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'tasktype') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'tasktype',         $proj->id)); ?>"><?php echo Filters::noXSS(L('tasktypes')); ?></a>
+  <a id="projstatuslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'status') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'status',     $proj->id)); ?>"><?php echo Filters::noXSS(L('taskstatuses')); ?></a>
+  <a id="projreslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'resolution') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'resolution',        $proj->id)); ?>"><?php echo Filters::noXSS(L('resolutions')); ?></a>
+  <a id="projcatlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'cat') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'cat',        $proj->id)); ?>"><?php echo Filters::noXSS(L('categories')); ?></a>
+  <a id="projoslink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'os') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'os',         $proj->id)); ?>"><?php echo Filters::noXSS(L('operatingsystems')); ?></a>
+  <a id="projverlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'version') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'version',        $proj->id)); ?>"><?php echo Filters::noXSS(L('versions')); ?></a>
+  <a id="projreqlink"
+     <?php if(isset($_GET['area']) and $_GET['area'] == 'pendingreq') echo $activeclass; ?>
+     href="<?php echo Filters::noXSS(CreateURL('pm', 'pendingreq', $proj->id)); ?>"><?php echo Filters::noXSS(L('pendingrequests')); ?></a>
+</div>
diff --git a/templates/pm.newgroup.tpl b/templates/pm.newgroup.tpl
new file mode 100644
index 0000000..dac1c9a
--- /dev/null
+++ b/templates/pm.newgroup.tpl
@@ -0,0 +1,7 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('pmtoolbox')); ?> :: <?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('createnewgroup')); ?></h3>
+
+    <?php
+    $this->display('common.newgroup.tpl');
+    ?>
+</div>
diff --git a/templates/pm.os.tpl b/templates/pm.os.tpl
new file mode 100644
index 0000000..87c9c31
--- /dev/null
+++ b/templates/pm.os.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('oslisted')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'os');
+  $this->assign('rows', $proj->listOs(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/pm.pendingreq.tpl b/templates/pm.pendingreq.tpl
new file mode 100644
index 0000000..3f816fb
--- /dev/null
+++ b/templates/pm.pendingreq.tpl
@@ -0,0 +1,76 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS(L('pendingrequests')); ?></h3>
+  
+  <?php if (!count($pendings)): ?>
+  <?php echo Filters::noXSS(L('nopendingreq')); ?>
+
+  <?php else: ?>
+  <table class="requests">
+    <tr>
+      <th><?php echo Filters::noXSS(L('eventdesc')); ?></th>
+      <th><?php echo Filters::noXSS(L('requestedby')); ?></th>
+      <th><?php echo Filters::noXSS(L('daterequested')); ?></th>
+      <th><?php echo Filters::noXSS(L('reasongiven')); ?></th>
+      <th class="pm-buttons"> </th>
+    </tr>
+    <?php foreach ($pendings as $req): ?>
+    <tr>
+      <td>
+      <?php if ($req['request_type'] == 1) : ?>
+      <?php echo Filters::noXSS(L('closetask')); ?> -
+      <a href="<?php echo Filters::noXSS(CreateURL('details', $req['task_id'])); ?>">FS#<?php echo Filters::noXSS($req['task_id']); ?> :
+        <?php echo Filters::noXSS($req['item_summary']); ?></a>
+      <?php elseif ($req['request_type'] == 2) : ?>
+      <?php echo Filters::noXSS(L('reopentask')); ?> -
+      <a href="<?php echo Filters::noXSS(CreateURL('details', $req['task_id'])); ?>">FS#<?php echo Filters::noXSS($req['task_id']); ?> :
+        <?php echo Filters::noXSS($req['item_summary']); ?></a>
+      <?php endif; ?>
+      </td>
+      <td><?php echo tpl_userlink($req['user_id']); ?></td>
+      <td><?php echo Filters::noXSS(formatDate($req['time_submitted'], true)); ?></td>
+      <td><?php echo Filters::noXSS($req['reason_given']); ?></td>
+      <td>
+        <?php if ($req['request_type'] == 1) : ?>
+        <a class="button" href="#" onclick="showhidestuff('closeform<?php echo Filters::noXSS($req['request_id']); ?>');"><?php echo Filters::noXSS(L('accept')); ?></a>
+    <div id="closeform<?php echo Filters::noXSS($req['request_id']); ?>"
+         class="denyform">
+        <form action="" method="post" id="formclosetask">
+            <div>
+                <input type="hidden" name="action" value="details.close"/>
+                <input type="hidden" name="task_id" value="<?php echo Filters::noXSS($req['task_id']); ?>"/>
+                <select class="adminlist" name="resolution_reason" onmouseup="Event.stop(event);">
+                    <option value="0"><?php echo Filters::noXSS(L('selectareason')); ?></option>
+                    <?php echo tpl_options($proj->listResolutions(), Req::val('resolution_reason')); ?>
+
+                </select>
+                <button type="submit"><?php echo Filters::noXSS(L('closetask')); ?></button>
+                <br/>
+                <label class="default text" for="closure_comment"><?php echo Filters::noXSS(L('closurecomment')); ?></label>
+                <textarea class="text" id="closure_comment" name="closure_comment" rows="3"
+                          cols="25"><?php echo Filters::noXSS(Req::val('closure_comment')); ?></textarea>
+                <label><?php echo tpl_checkbox('mark100', Req::val('mark100', !(Req::val('action') == 'details.close'))); ?>&nbsp;&nbsp;<?php echo Filters::noXSS(L('mark100')); ?></label>
+            </div>
+        </form>
+    </div>
+        <?php elseif ($req['request_type'] == 2) : ?>
+        <a class="button" href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=details&amp;action=reopen&task_id=<?php echo Filters::noXSS($req['task_id']); ?>"><?php echo Filters::noXSS(L('accept')); ?></a>
+        <?php endif; ?>
+        <a href="#" class="button" onclick="showhidestuff('denyform<?php echo Filters::noXSS($req['request_id']); ?>');"><?php echo Filters::noXSS(L('deny')); ?></a>
+        <div id="denyform<?php echo Filters::noXSS($req['request_id']); ?>" class="denyform">
+          <form action="<?php echo Filters::noXSS(CreateUrl('pm', 'pendingreq', $proj->id)); ?>" method="post">
+            <div>
+              <input type="hidden" name="action" value="denypmreq" />
+              <input type="hidden" name="req_id" value="<?php echo Filters::noXSS($req['request_id']); ?>" />
+              <label for="deny_reason<?php echo Filters::noXSS($req['request_id']); ?>" class="inline"><?php echo Filters::noXSS(L('reasonfordeinal')); ?></label><br />
+              <textarea cols="40" rows="5" name="deny_reason" id="deny_reason<?php echo Filters::noXSS($req['request_id']); ?>"></textarea>
+              <br />
+              <button type="submit"><?php echo Filters::noXSS(L('deny')); ?></button>
+            </div>
+          </form>
+        </div>
+      </td>
+    </tr>
+    <?php endforeach; ?>
+  </table>
+  <?php endif; ?>
+</div>
diff --git a/templates/pm.prefs.tpl b/templates/pm.prefs.tpl
new file mode 100644
index 0000000..360cf4e
--- /dev/null
+++ b/templates/pm.prefs.tpl
@@ -0,0 +1,239 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('preferences')); ?></h3>
+
+  <form action="<?php echo Filters::noXSS(CreateUrl('pm', 'prefs', $proj->id)); ?>" method="post">
+  <ul id="submenu">
+   <li><a href="#general"><?php echo Filters::noXSS(L('general')); ?></a></li>
+   <li><a href="#lookandfeel"><?php echo Filters::noXSS(L('lookandfeel')); ?></a></li>
+   <li><a href="#notifications"><?php echo Filters::noXSS(L('notifications')); ?></a></li>
+   <li><a href="#feeds"><?php echo Filters::noXSS(L('feeds')); ?></a></li>
+   <li><a href="#effort"><?php echo Filters::noXSS(L('efforttracking')); ?></a></li>
+  </ul>
+
+  <div id="general" class="tab">
+      <ul class="form_elements wide">
+        <li>
+          <label for="projecttitle"><?php echo Filters::noXSS(L('projecttitle')); ?></label>
+          <input id="projecttitle" name="project_title" class="text" type="text" size="40" maxlength="100"
+            value="<?php echo Filters::noXSS(Post::val('project_title', $proj->prefs['project_title'])); ?>" />
+        </li>
+
+        <li>
+          <label for="defaultcatowner"><?php echo Filters::noXSS(L('defaultcatowner')); ?></label>
+          <?php echo tpl_userselect('default_cat_owner', Post::val('default_cat_owner', $proj->prefs['default_cat_owner']), 'defaultcatowner'); ?>
+
+        </li>
+
+        <li>
+          <label for="langcode"><?php echo Filters::noXSS(L('language')); ?></label>
+          <select id="langcode" name="lang_code">
+            <?php echo tpl_options(Flyspray::listLangs(), Post::val('lang_code', $proj->prefs['lang_code']), true); ?>
+
+          </select>
+        </li>
+
+        <li>
+          <label for="intromesg"><?php echo Filters::noXSS(L('intromessage')); ?></label>
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <div class="hide preview" id="preview"></div>
+          <?php endif; ?>
+          <?php echo TextFormatter::textarea('intro_message', 8, 70, array('accesskey' => 'r', 'tabindex' => 8, 'id' => 'intromesg'), Post::val('intro_message', $proj->prefs['intro_message'])); ?>
+
+          <br />
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <button tabindex="9" type="button" onclick="showPreview('intromesg', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview')"><?php echo Filters::noXSS(L('preview')); ?></button>
+          <?php endif; ?>
+        </li>
+
+        <li>
+          <label for="default_task"><?php echo Filters::noXSS(L('defaulttask')); ?></label>
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <div class="hide preview" id="preview_taskdesc"></div>
+          <?php endif; ?>
+          <?php echo TextFormatter::textarea('default_task', 8, 70, array('accesskey' => 'r', 'tabindex' => 8, 'id' => 'default_task'), Post::val('default_task', $proj->prefs['default_task'])); ?>
+
+          <br />
+          <?php if (defined('FLYSPRAY_HAS_PREVIEW')): ?>
+          <button tabindex="9" type="button" onclick="showPreview('default_task', '<?php echo Filters::noJsXSS($baseurl); ?>', 'preview_taskdesc')"><?php echo Filters::noXSS(L('preview')); ?></button>
+          <?php endif; ?>
+        </li>
+
+        <li>
+          <label for="isactive"><?php echo Filters::noXSS(L('isactive')); ?></label>
+          <?php echo tpl_checkbox('project_is_active', Post::val('project_is_active', $proj->prefs['project_is_active']), 'isactive'); ?>
+
+        </li>
+
+        <li>
+          <label for="disp_intro"><?php echo Filters::noXSS(L('dispintro')); ?></label>
+          <?php echo tpl_checkbox('disp_intro', Post::val('disp_intro', $proj->prefs['disp_intro']), 'disp_intro'); ?>
+
+        </li>
+	
+        <li>
+          <label><?php echo tpl_checkbox('delete_project', null); ?> <?php echo Filters::noXSS(L('deleteproject')); ?></label>
+          <select name="move_to"><?php echo tpl_options(array_merge(array(0 => L('none')), Flyspray::listProjects()), null, false, null, (string) $proj->id); ?></select>
+        </li>
+
+        <li>
+          <label for="othersview"><?php echo Filters::noXSS(L('othersview')); ?></label>
+          <?php echo tpl_checkbox('others_view', Post::val('others_view', $proj->prefs['others_view']), 'othersview'); ?>
+
+        </li>
+
+        <li>
+          <label for="anon_open"><?php echo Filters::noXSS(L('allowanonopentask')); ?></label>
+          <?php echo tpl_checkbox('anon_open', Post::val('anon_open', $proj->prefs['anon_open']), 'anon_open'); ?>
+
+        </li>
+
+        <li>
+          <label for="comment_closed"><?php echo Filters::noXSS(L('allowclosedcomments')); ?></label>
+          <?php echo tpl_checkbox('comment_closed', Post::val('comment_closed', $proj->prefs['comment_closed']), 'comment_closed'); ?>
+
+        </li>
+
+        <li>
+          <label for="auto_assign"><?php echo Filters::noXSS(L('autoassign')); ?></label>
+          <?php echo tpl_checkbox('auto_assign', Post::val('auto_assign', $proj->prefs['auto_assign']), 'auto_assign'); ?>
+
+        </li>
+
+        <li>
+          <label for="defaultdueversion"><?php echo Filters::noXSS(L('defaultdueinversion')); ?></label>
+          <select id="defaultdueversion" name="default_due_version">
+              <option value="0"><?php echo Filters::noXSS(L('undecided')); ?></option>
+              <?php echo tpl_options($proj->listVersions(false, 3), Post::val('default_due_version', $proj->prefs['default_due_version']), true); ?>
+
+          </select>
+        </li>
+      </ul>
+    </div>
+
+    <div id="lookandfeel" class="tab">
+      <ul class="form_elements wide">
+        <li>
+          <label for="themestyle"><?php echo Filters::noXSS(L('themestyle')); ?></label>
+          <select id="themestyle" name="theme_style">
+            <?php echo tpl_options(Flyspray::listThemes(), Post::val('theme_style', $proj->prefs['theme_style']), true); ?>
+
+          </select>
+        </li>
+
+        <li>
+          <label for="default_entry"><?php echo Filters::noXSS(L('defaultentry')); ?></label>
+          <select id="default_entry" name="default_entry">
+            <?php echo tpl_options(array('index' => L('tasklist'), 'toplevel' => L('toplevel'), 'roadmap' => L('roadmap')), Post::val('default_entry', $proj->prefs['default_entry'])); ?>
+
+          </select>
+        </li>
+  
+        <li>
+          <label><?php echo Filters::noXSS(L('visiblecolumns')); ?></label>
+          <?php // Set the selectable column names
+          $columnnames = array('id', 'parent', 'tasktype', 'category', 'severity',
+          'priority', 'summary', 'dateopened', 'status', 'openedby', 'private',
+          'assignedto', 'lastedit', 'reportedin', 'dueversion', 'duedate',
+          'comments', 'attachments', 'progress', 'dateclosed', 'os', 'votes');
+          $selectedcolumns = explode(' ', Post::val('visible_columns', $proj->prefs['visible_columns']));
+          ?>
+          <?php echo tpl_double_select('visible_columns', $columnnames, $selectedcolumns, true); ?>
+
+        </li>
+        <li>
+          <label><?php echo Filters::noXSS(L('visiblefields')); ?></label>
+          <?php // Set the selectable field names
+          $fieldnames = array('parent', 'tasktype', 'category', 'severity', 'priority', 'status', 'private',
+          'assignedto', 'reportedin', 'dueversion', 'duedate', 'progress', 'os', 'votes');
+          $selectedfields = explode(' ', Post::val('visible_fields', $proj->prefs['visible_fields']));
+          ?>
+          <?php echo tpl_double_select('visible_fields', $fieldnames, $selectedfields, true); ?>
+
+        </li>
+      </ul>
+    </div>
+
+    <div id="notifications" class="tab">
+      <ul class="form_elements">
+        <li>
+          <label for="notify_subject"><?php echo Filters::noXSS(L('notifysubject')); ?></label>
+          <input id="notify_subject" class="text" name="notify_subject" type="text" size="40" value="<?php echo Filters::noXSS(Post::val('notify_subject', $proj->prefs['notify_subject'])); ?>" />
+          <br /><span class="note"><?php echo Filters::noXSS(L('notifysubjectinfo')); ?></span>
+        </li>
+
+        <li>
+          <label for="emailaddress"><?php echo Filters::noXSS(L('emailaddress')); ?></label>
+          <input id="emailaddress" name="notify_email" class="text" type="text" value="<?php echo Filters::noXSS(Post::val('notify_email', $proj->prefs['notify_email'])); ?>" />
+        </li>
+
+        <li>
+          <label for="jabberid"><?php echo Filters::noXSS(L('jabberid')); ?></label>
+          <input id="jabberid" class="text" name="notify_jabber" type="text" value="<?php echo Filters::noXSS(Post::val('notify_jabber', $proj->prefs['notify_jabber'])); ?>" />
+        </li>
+
+        <li>
+          <label for="notify_reply"><?php echo Filters::noXSS(L('replyto')); ?></label>
+          <input id="notify_reply" name="notify_reply" class="text" type="text" value="<?php echo Filters::noXSS(Post::val('notify_reply', $proj->prefs['notify_reply'])); ?>" />
+        </li>
+
+        <li>
+          <label for="notify_types"><?php echo Filters::noXSS(L('notifytypes')); ?></label>
+          <select id="notify_types" size="10" multiple="multiple" name="notify_types[]">
+          <?php echo tpl_options(array(0 => L('none'),
+                              NOTIFY_TASK_OPENED     => L('taskopened'),
+                              NOTIFY_TASK_CHANGED    => L('pm.taskchanged'),
+                              NOTIFY_TASK_CLOSED     => L('taskclosed'),
+                              NOTIFY_TASK_REOPENED   => L('pm.taskreopened'),
+                              NOTIFY_DEP_ADDED       => L('pm.depadded'),
+                              NOTIFY_DEP_REMOVED     => L('pm.depremoved'),
+                              NOTIFY_COMMENT_ADDED   => L('commentadded'),
+                              NOTIFY_ATT_ADDED       => L('attachmentadded'),
+                              NOTIFY_REL_ADDED       => L('relatedadded'),
+                              NOTIFY_OWNERSHIP       => L('ownershiptaken'),
+                              NOTIFY_PM_REQUEST      => L('pmrequest'),
+                              NOTIFY_PM_DENY_REQUEST => L('pmrequestdenied'),
+                              NOTIFY_NEW_ASSIGNEE    => L('newassignee'),
+                              NOTIFY_REV_DEP         => L('revdepadded'),
+                              NOTIFY_REV_DEP_REMOVED => L('revdepaddedremoved'),
+                              NOTIFY_ADDED_ASSIGNEES => L('assigneeadded')),
+                              Post::val('notify_types', Flyspray::int_explode(' ', $proj->prefs['notify_types']))); ?>
+
+          </select>
+        </li>
+      </ul>
+    </div>
+
+    <div id="feeds" class="tab">
+      <ul class="form_elements">
+        <li>
+          <label for="feed_description"><?php echo Filters::noXSS(L('feeddescription')); ?></label>
+          <input id="feed_description" class="text" name="feed_description" type="text" value="<?php echo Filters::noXSS(Post::val('feed_description', $proj->prefs['feed_description'])); ?>" />
+        </li>
+
+        <li>
+          <label for="feed_img_url"><?php echo Filters::noXSS(L('feedimgurl')); ?></label>
+          <input id="feed_img_url" class="text" name="feed_img_url" type="text" value="<?php echo Filters::noXSS(Post::val('feed_img_url', $proj->prefs['feed_img_url'])); ?>" />
+        </li>
+      </ul>
+    </div>
+
+  <div id="effort" class="tab">
+      <ul class="form_elements">
+          <li>
+              <label for="useeffort"><?php echo Filters::noXSS(L('useeffort')); ?></label>
+              <?php echo tpl_checkbox('use_effort_tracking', Post::val('use_effort_tracking', $proj->prefs['use_effort_tracking']), 'useeffort'); ?>
+
+          </li>
+      </ul>
+  </div>
+
+    <div class="tbuttons">
+      <input type="hidden" name="action" value="pm.updateproject" />
+      <input type="hidden" name="project_id" value="<?php echo Filters::noXSS($proj->id); ?>" />
+      <button type="submit"><?php echo Filters::noXSS(L('saveoptions')); ?></button>
+
+      <button type="reset"><?php echo Filters::noXSS(L('resetoptions')); ?></button>
+    </div>
+  </form>
+
+</div>
diff --git a/templates/pm.resolution.tpl b/templates/pm.resolution.tpl
new file mode 100644
index 0000000..2604925
--- /dev/null
+++ b/templates/pm.resolution.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('resed')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'resolution');
+  $this->assign('rows', $proj->listResolutions(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/pm.status.tpl b/templates/pm.status.tpl
new file mode 100644
index 0000000..ffcebbf
--- /dev/null
+++ b/templates/pm.status.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('taskstatuses')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'status');
+  $this->assign('rows', $proj->listTaskStatuses(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/pm.tasktype.tpl b/templates/pm.tasktype.tpl
new file mode 100644
index 0000000..e1afe2d
--- /dev/null
+++ b/templates/pm.tasktype.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('tasktypeed')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'tasktype');
+  $this->assign('rows', $proj->listTaskTypes(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
\ No newline at end of file
diff --git a/templates/pm.version.tpl b/templates/pm.version.tpl
new file mode 100644
index 0000000..4c1340a
--- /dev/null
+++ b/templates/pm.version.tpl
@@ -0,0 +1,9 @@
+<div id="toolbox">
+  <h3><?php echo Filters::noXSS($proj->prefs['project_title']); ?> : <?php echo Filters::noXSS(L('verlisted')); ?></h3>
+
+  <?php
+  $this->assign('list_type', 'version');
+  $this->assign('rows', $proj->listVersions(true));
+  $this->display('common.list.tpl');
+  ?>
+</div>
diff --git a/templates/profile.tpl b/templates/profile.tpl
new file mode 100644
index 0000000..ef4b2d0
--- /dev/null
+++ b/templates/profile.tpl
@@ -0,0 +1,95 @@
+<fieldset class="box"><legend><?php echo Filters::noXSS(L('profile')); ?> <?php echo Filters::noXSS($theuser->infos['real_name']); ?> (<?php echo Filters::noXSS($theuser->infos['user_name']); ?>)</legend>
+
+<table id="profile">
+  <tr>
+    <th><?php echo Filters::noXSS(L('realname')); ?></th>
+    <td>
+      <?php echo Filters::noXSS($theuser->infos['real_name']); ?>
+
+    </td>
+  </tr>
+  <tr>
+  <?php if (!$user->isAnon()): ?>
+    <th><?php echo Filters::noXSS(L('emailaddress')); ?></th>
+    <td>
+      <a href="mailto:<?php echo Filters::noXSS($theuser->infos['email_address']); ?>"><?php echo Filters::noXSS($theuser->infos['email_address']); ?></a>
+    </td>
+  </tr>
+  <?php endif; ?>
+  <tr>
+    <th><?php echo Filters::noXSS(L('jabberid')); ?></th>
+    <td>
+      <?php echo Filters::noXSS($theuser->infos['jabber_id']); ?>
+
+    </td>
+  </tr>
+  <tr>
+    <th><?php echo Filters::noXSS(L('globalgroup')); ?></th>
+    <td>
+      <?php echo Filters::noXSS($groups[Flyspray::array_find('group_id', $theuser->infos['global_group'], $groups)]['group_name']); ?>
+
+    </td>
+  </tr>
+  <?php if ($proj->id): ?>
+  <tr>
+    <th><?php echo Filters::noXSS(L('projectgroup')); ?></th>
+    <td>
+    <?php if ($user->perms('manage_project')): ?>
+    <form method="post" action="<?php echo Filters::noXSS($baseurl); ?>index.php?do=user&amp;id=<?php echo Filters::noXSS($theuser->id); ?>"><div>
+      <select id="projectgroupin" class="adminlist" name="project_group_in">
+        <?php $sel = $theuser->perms('project_group') == '' ? 0 : $theuser->perms('project_group'); ?>
+        <?php echo tpl_options(array_merge($project_groups, array(0 => array('group_name' => L('none'), 0 => 0, 'group_id' => 0, 1 => L('none')))), $sel); ?>
+
+      </select>
+      <input type="hidden" name="old_project_id" value="<?php echo Filters::noXSS($theuser->perms('project_group')); ?>" />
+      <input type="hidden" name="action" value="admin.edituser" />
+      <input type="hidden" name="user_id" value="<?php echo Filters::noXSS($theuser->id); ?>" />
+      <input type="hidden" name="onlypmgroup" value="1" />
+
+      <button type="submit"><?php echo Filters::noXSS(L('update')); ?></button>
+    </div></form>
+    <?php else: ?>
+      <?php if ($theuser->perms('project_group')): ?>
+      <?php echo Filters::noXSS($project_groups[Flyspray::array_find('group_id', $theuser->perms('project_group'), $project_groups)]['group_name']); ?>
+
+      <?php else: ?>
+      <?php echo Filters::noXSS(L('none')); ?>
+
+      <?php endif; ?>
+    <?php endif; ?>
+    </td>
+  </tr>
+  <?php endif; ?>
+  <tr>
+    <th><a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?opened=<?php echo Filters::noXSS($theuser->id); ?>&amp;status[]="><?php echo Filters::noXSS(L('tasksopened')); ?></a></th>
+    <td>
+      <?php echo Filters::noXSS($tasks); ?>
+
+    </td>
+  </tr>
+  <tr>
+    <th><a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?dev=<?php echo Filters::noXSS($theuser->id); ?>"><?php echo Filters::noXSS(L('assignedto')); ?></a></th>
+    <td>
+      <?php echo Filters::noXSS($assigned); ?>
+
+    </td>
+  </tr>
+  <tr>
+    <th><?php echo Filters::noXSS(L('comments')); ?></th>
+    <td>
+      <?php echo Filters::noXSS($comments); ?>
+
+    </td>
+  </tr>
+  <?php if ($theuser->infos['register_date']): ?>
+  <tr>
+    <th><?php echo Filters::noXSS(L('regdate')); ?></th>
+    <td>
+      <?php echo Filters::noXSS(formatDate($theuser->infos['register_date'])); ?>
+
+    </td>
+  </tr>
+  <?php endif; ?>
+</table>
+
+</fieldset>
diff --git a/templates/progressbar.tpl b/templates/progressbar.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/templates/register.magic.tpl b/templates/register.magic.tpl
new file mode 100644
index 0000000..d8ba04f
--- /dev/null
+++ b/templates/register.magic.tpl
@@ -0,0 +1,30 @@
+<h3><?php echo Filters::noXSS(L('registernewuser')); ?></h3>
+<div class="box">
+  
+<form action="<?php echo Filters::noXSS($baseurl); ?>index.php" name="registernewuser" method="post" id="registernewuser">
+  <p><?php echo Filters::noXSS(L('entercode')); ?></p>
+  <ul class="form_elements wide">
+    <li>
+      <label for="confirmation_code"><?php echo Filters::noXSS(L('confirmationcode')); ?></label>
+      <input id="confirmation_code" class="text" name="confirmation_code" value="<?php echo Filters::noXSS(Req::val('confirmation_code')); ?>" type="text" size="20" maxlength="20" />
+    </li>
+
+    <li>
+      <label for="user_pass"><?php echo Filters::noXSS(L('password')); ?></label>
+      <input id="user_pass" class="password" name="user_pass" value="<?php echo Filters::noXSS(Req::val('user_pass')); ?>" type="password" size="20" maxlength="100" /> <em><?php echo Filters::noXSS(L('minpwsize')); ?></em>
+    </li>
+
+    <li>
+      <label for="user_pass2"><?php echo Filters::noXSS(L('confirmpass')); ?></label>
+      <input id="user_pass2" class="password" name="user_pass2" value="<?php echo Filters::noXSS(Req::val('user_pass2')); ?>" type="password" size="20" maxlength="100" />
+    </li>
+  </ul>
+
+    <div>
+        <input type="hidden" name="action" value="register.registeruser" />
+        <input type="hidden" name="magic_url" value="<?php echo Filters::noXSS(Req::val('magic_url')); ?>" />
+        <button type="submit" name="buSubmit"><?php echo Filters::noXSS(L('registeraccount')); ?></button>
+    </div>
+</form>
+
+</div>
diff --git a/templates/register.no-magic.tpl b/templates/register.no-magic.tpl
new file mode 100644
index 0000000..434d513
--- /dev/null
+++ b/templates/register.no-magic.tpl
@@ -0,0 +1,56 @@
+<h3><?php echo Filters::noXSS(L('registernewuser')); ?></h3>
+<div class="box">
+
+<form action="<?php echo Filters::noXSS(CreateUrl('register')); ?>" method="post" id="registernewuser">
+  <ul class="form_elements wide">
+    <li>
+      <label for="username"><?php echo Filters::noXSS(L('username')); ?></label>
+      <input class="required text" value="<?php echo Filters::noXSS(Req::val('user_name')); ?>" id="username" name="user_name" type="text" size="20" maxlength="32" onblur="checkname(this.value);" /> <?php echo Filters::noXSS(L('validusername')); ?><br /><strong><span id="errormessage"></span></strong>
+    </li>
+
+    <li>
+      <label for="realname"><?php echo Filters::noXSS(L('realname')); ?></label>
+      <input class="required text" value="<?php echo Filters::noXSS(Req::val('real_name')); ?>" id="realname" name="real_name" type="text" size="30" maxlength="100" />
+    </li>
+
+    <li>
+      <label for="emailaddress"><?php echo Filters::noXSS(L('emailaddress')); ?></label>
+      <input id="emailaddress" value="<?php echo Filters::noXSS(Req::val('email_address')); ?>" name="email_address" class="required text" type="text" size="20" maxlength="100" /> <?php echo Filters::noXSS(L('validemail')); ?>
+
+    </li>
+
+    <li>
+      <label for="jabberid"><?php echo Filters::noXSS(L('jabberid')); ?></label>
+      <input id="jabberid" value="<?php echo Filters::noXSS(Req::val('jabber_id')); ?>" name="jabber_id" type="text" class="text" size="20" maxlength="100" />
+    </li>
+
+    <li>
+      <label for="notify_type"><?php echo Filters::noXSS(L('notifications')); ?></label>
+      <select id="notify_type" name="notify_type">
+        <?php echo tpl_options($fs->GetNotificationOptions(), Req::val('notify_type')); ?>
+
+      </select>
+    </li>
+
+    <li>
+      <label for="time_zone"><?php echo Filters::noXSS(L('timezone')); ?></label>
+      <select id="time_zone" name="time_zone">
+        <?php
+          $times = array();
+          for ($i = -12; $i <= 13; $i++) {
+            $times[$i] = L('GMT') . (($i == 0) ? ' ' : (($i > 0) ? '+' . $i : $i));
+          }
+        ?>
+        <?php echo tpl_options($times, Req::val('time_zone', 0)); ?>
+
+      </select>
+    </li>
+  </ul>
+ <div>
+    <input type="hidden" name="action" value="register.sendcode" />
+    <button type="submit" name="buSubmit" id="buSubmit"><?php echo Filters::noXSS(L('sendcode')); ?></button>
+  </div>
+  <br />
+  <p><?php echo L('note'); ?></p>
+</form>
+</div>
diff --git a/templates/register.oauth.tpl b/templates/register.oauth.tpl
new file mode 100644
index 0000000..0e6ed38
--- /dev/null
+++ b/templates/register.oauth.tpl
@@ -0,0 +1,15 @@
+<h3><?php echo Filters::noXSS(L('register')); ?></h3>
+<div class="box">
+
+<form action="index.php?do=oauth" method="post" id="registernewuser">
+  <ul class="form_elements">
+    <li>
+      <label for="username"><?php echo Filters::noXSS(L('username')); ?></label>
+      <input class="required text" value="<?php echo Filters::noXSS($username); ?>" id="user_name" name="username" type="text" size="20" maxlength="32"  /> <?php echo Filters::noXSS(L('validusername')); echo '<span class="warning"> ' . Filters::noXSS(L('usernametaken')) . '</span>'; ?>
+    </li>
+  </ul>
+ <div>
+    <button type="submit" name="buSubmit" id="buSubmit"><?php echo Filters::noXSS(L('register')); ?></button>
+  </div>
+</form>
+</div>
diff --git a/templates/register.ok.tpl b/templates/register.ok.tpl
new file mode 100644
index 0000000..fd5db29
--- /dev/null
+++ b/templates/register.ok.tpl
@@ -0,0 +1,4 @@
+<div class="redirectmessage">
+  <p><?php echo Filters::noXSS(L('loginbelow')); ?></p>
+  <p><?php echo Filters::noXSS(L('newuserwarning')); ?></p>
+</div>
diff --git a/templates/reports.tpl b/templates/reports.tpl
new file mode 100644
index 0000000..4295a08
--- /dev/null
+++ b/templates/reports.tpl
@@ -0,0 +1,115 @@
+<h3><?php echo Filters::noXSS(L('eventlog')); ?></h3>
+<div class="box">
+    <form action="<?php echo Filters::noXSS($baseurl); ?>index.php" method="get">
+      <table id="event1">
+        <tr>
+          <td><label for="events[]"><?php echo Filters::noXSS(L('events')); ?></label></td>
+          <td>
+              <select name="events[]" class='eventlist' multiple="multiple" id="events[]" size="<?php echo Filters::noXSS(count($events)+count($user_events)+2); ?>">
+              <optgroup label="<?php echo Filters::noXSS(L('Tasks')); ?>">
+              <?php echo tpl_options($events, Req::val('events')); ?>
+
+              </optgroup>
+              <optgroup label="<?php echo Filters::noXSS(L('users')); ?>">
+              <?php echo tpl_options($user_events, Req::val('events')); ?>
+
+              </optgroup>
+              </select>    
+          </td>
+          <td>
+              <div>
+                  <label class="inline" for="fromdate"><?php echo Filters::noXSS(L('from')); ?></label>
+                  <?php echo tpl_datepicker('fromdate'); ?>
+
+                  <?php echo tpl_datepicker('todate', L('to')); ?>
+
+              </div>
+              
+              <div>
+                  <label for="event_number"><?php echo Filters::noXSS(L('show')); ?></label>
+                  <select name="event_number" id="event_number">
+                   <?php echo tpl_options(array(-1 => L('all'), 10 => 10, 20 => 20, 50 => 50, 100 => 100, 200 => 200), Req::val('event_number', 20)); ?>
+
+                  </select>
+                  <?php echo Filters::noXSS(L('events')); ?>
+
+              </div>
+          </td>
+        </tr>
+      </table>
+      
+      <input type="hidden" name="project" value="<?php echo Filters::noXSS($proj->id); ?>" />
+      <input type="hidden" name="do" value="reports" />
+      <button type="submit" name="submit"><?php echo Filters::noXSS(L('show')); ?></button>
+    </form>
+    
+    <?php if ($histories): ?>
+    <div id="tasklist">
+    <table id="tasklist_table">
+     <thead>
+      <tr>
+        <th>
+          <a href="<?php echo Filters::noXSS(CreateURL('reports', null, null, array('sort' => (Req::val('order') == 'type' && $sort == 'DESC') ? 'asc' : 'desc', 'order' => 'type') + $_GET)); ?>">
+            <?php echo Filters::noXSS(L('event')); ?>
+
+          </a>
+        </th>
+        <th>
+          <a href="<?php echo Filters::noXSS(CreateURL('reports', null, null, array('sort' => (Req::val('order') == 'user' && $sort == 'DESC') ? 'asc' : 'desc', 'order' => 'user') + $_GET)); ?>">
+            <?php echo Filters::noXSS(L('user')); ?>
+
+          </a>
+        </th>
+        <th>
+          <a href="<?php echo Filters::noXSS(CreateURL('reports', null, null, array('sort' => (Req::val('order') == 'date' && $sort == 'DESC') ? 'asc' : 'desc', 'order' => 'date') + $_GET)); ?>">
+            <?php echo Filters::noXSS(L('eventdate')); ?>
+
+          </a>
+        </th>
+        <th><?php echo Filters::noXSS(L('summary')); ?></th>
+      </tr>
+     </thead>
+      <?php foreach ($histories as $history): ?>
+        <?php if (isset($events[$history['event_type']])): ?>
+      <tr class="severity1"><?php /* just for different colors */ ?>
+        <td><?php echo Filters::noXSS($events[$history['event_type']]); ?></td>
+        <?php else: ?>
+      <tr class="severity2">
+        <td><?php echo Filters::noXSS($user_events[$history['event_type']]); ?></td>
+        <?php endif; ?>
+        <td><?php echo tpl_userlink($history['user_id']); ?></td>
+        <td><?php echo Filters::noXSS(formatDate($history['event_date'], true)); ?></td>
+        <?php if ($history['event_type'] > 29):
+              $user_data = unserialize($history['new_value']); ?>
+        <td>
+          <a href="javascript:showhidestuff('h<?php echo Filters::noXSS($history['history_id']); ?>')"><?php echo Filters::noXSS(L('detailedinfo')); ?></a>
+          <div class="hide popup" id="h<?php echo Filters::noXSS($history['history_id']); ?>">
+            <table>
+              <tr>
+                <th><?php echo Filters::noXSS(L('username')); ?></th>
+                <td><?php echo Filters::noXSS($user_data['user_name']); ?></td>
+              </tr>
+              <tr>
+                <th><?php echo Filters::noXSS(L('realname')); ?></th>
+                <td><?php echo Filters::noXSS($user_data['real_name']); ?></td>
+              </tr>
+              <tr>
+                <th><?php echo Filters::noXSS(L('email')); ?></th>
+                <td><?php echo Filters::noXSS($user_data['email_address']); ?></td>
+              </tr>
+              <tr>
+                <th><?php echo Filters::noXSS(L('jabber')); ?></th>
+                <td><?php echo Filters::noXSS($user_data['jabber_id']); ?></td>
+              </tr>
+            </table>
+          </div>
+        </td>
+        <?php else: ?>
+        <td><?php echo tpl_tasklink($history); ?></td>
+        <?php endif; ?>
+      </tr>
+      <?php endforeach; ?>
+    </table>
+    </div>
+    <?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/templates/roadmap.text.tpl b/templates/roadmap.text.tpl
new file mode 100644
index 0000000..00e1a4a
--- /dev/null
+++ b/templates/roadmap.text.tpl
@@ -0,0 +1,49 @@
+=== <?php echo Filters::noXSS($proj->prefs['project_title']); ?> ===
+
+<?php foreach($data as $milestone): ?>
+<?php echo Filters::noXSS(L('roadmapfor')); ?> <?php echo Filters::noXSS($milestone['name']); ?>
+
+
+<?php echo Filters::noXSS($milestone['percent_complete']); ?><?php echo Filters::noXSS(L('of')); ?> <?php echo Filters::noXSS(count($milestone['all_tasks'])); ?> <?php echo Filters::noXSS(L('tasks')); ?> <?php echo Filters::noXSS(L('completed')); ?> <?php
+   if(count($milestone['open_tasks'])):
+   ?><?php echo Filters::noXSS(count($milestone['open_tasks'])); ?> <?php echo Filters::noXSS(L('opentasks')); ?>:<?php
+   endif; ?>
+<?php
+    if($proj->prefs['use_effort_tracking'])
+    {
+
+    $total_estimated = 0;
+    $actual_effort = 0;
+
+    foreach($milestone['open_tasks'] as $task)
+    {
+    $total_estimated += $task['estimated_effort'];
+    $effort = new effort($task['task_id'],0);
+    $effort->populateDetails();
+
+    foreach($effort->details as $details)
+    {
+    $actual_effort += $details['effort'];
+    }
+    $effort = null;
+    }
+
+?>
+
+<?php echo Filters::noXSS(L('opentasks')); ?> - <?php echo Filters::noXSS(L('totalestimatedeffort')); ?>: <?php echo ConvertSeconds($total_estimated *60 *60); ?>
+
+<?php echo Filters::noXSS(L('opentasks')); ?> - <?php echo Filters::noXSS(L('actualeffort')); ?>: <?php echo ConvertSeconds($actual_effort); ?>
+<?php } ?>
+
+<?php if(count($milestone['open_tasks'])): ?>
+
+<?php foreach($milestone['open_tasks'] as $task):
+          if(!$user->can_view_task($task)) continue; ?>
+FS#<?php echo Filters::noXSS($task['task_id']); ?> - <?php echo Filters::noXSS($task['item_summary']); ?>
+
+
+<?php endforeach; ?>
+
+<?php endif; ?>
+
+<?php endforeach; ?>
diff --git a/templates/roadmap.tpl b/templates/roadmap.tpl
new file mode 100644
index 0000000..6063873
--- /dev/null
+++ b/templates/roadmap.tpl
@@ -0,0 +1,107 @@
+<script type="text/javascript">
+
+function hideAll(allTasks)
+{
+    for (i = 0; i < allTasks.length; i++) {
+        if (!allTasks[i]) continue;
+        hidestuff('dd'+ allTasks[i]);
+        hidestuff('hide'+ allTasks[i]);
+        showstuff('expand'+ allTasks[i], 'inline');
+    }
+}
+
+function showAll(allTasks)
+{
+    for (i = 0; i < allTasks.length; i++) {
+        if (!allTasks[i]) continue;
+        showstuff('dd'+ allTasks[i]);
+        hidestuff('expand'+ allTasks[i]);
+        showstuff('hide'+ allTasks[i], 'inline');
+    }
+}
+</script>
+
+<?php foreach($data as $milestone): ?>
+
+<script type="text/javascript">
+allTasks<?php echo Filters::noXSS($milestone['id']); ?> = [<?php foreach($milestone['open_tasks'] as $task): echo $task['task_id'] . ','; endforeach; ?>];
+</script>
+
+<div class="box roadmap">
+<h3><?php echo Filters::noXSS(L('roadmapfor')); ?> <?php echo Filters::noXSS($milestone['name']); ?>
+
+    <?php if (count($milestone['open_tasks'])): ?>
+    <small class="DoNotPrint">
+      <a href="javascript:showAll(allTasks<?php echo Filters::noXSS($milestone['id']); ?>)"><?php echo Filters::noXSS(L('expandall')); ?></a> |
+      <a href="javascript:hideAll(allTasks<?php echo Filters::noXSS($milestone['id']); ?>)"><?php echo Filters::noXSS(L('collapseall')); ?></a>
+    </small>
+    <?php endif; ?>
+</h3>
+<div class="progress_bar_container" style="width: 250px;">
+	<span><?php echo Filters::noXSS($milestone['percent_complete']); ?>%</span>
+	<div class="progress_bar" style="width:<?php echo Filters::noXSS($milestone['percent_complete']); ?>%"></div>
+</div>
+<p style="margin-top: 5px;"><?php echo Filters::noXSS($milestone['percent_complete']); ?><?php echo Filters::noXSS(L('of')); ?>
+
+   <a href="<?php echo Filters::noXSS($baseurl); ?>index.php?do=index&amp;tasks=&amp;project=<?php echo Filters::noXSS($proj->id); ?>&amp;due=<?php echo Filters::noXSS($milestone['id']); ?>&amp;status[]=">
+     <?php echo Filters::noXSS(count($milestone['all_tasks'])); ?> <?php echo Filters::noXSS(L('tasks')); ?>
+
+   </a> <?php echo Filters::noXSS(L('completed')); ?>
+
+   <?php if(count($milestone['open_tasks'])): ?>
+   <a href="<?php echo Filters::noXSS($baseurl); ?>index.php?do=index&amp;tasks=&amp;project=<?php echo Filters::noXSS($proj->id); ?>&amp;due=<?php echo Filters::noXSS($milestone['id']); ?>"><?php echo Filters::noXSS(count($milestone['open_tasks'])); ?> <?php echo Filters::noXSS(L('opentasks')); ?>:</a>
+   <?php endif; ?>
+    <?php
+    if($proj->prefs['use_effort_tracking']) {
+    $total_estimated = 0;
+    $actual_effort = 0;
+    foreach($milestone['open_tasks'] as $task)
+    {
+    $total_estimated += $task['estimated_effort'];
+    $effort = new effort($task['task_id'],0);
+    $effort->populateDetails();
+    foreach($effort->details as $details)
+    {
+    $actual_effort += $details['effort'];
+    }
+    $effort = null;
+    }
+    ?>
+    </br>
+    <?php echo Filters::noXSS(L('opentasks')); ?> - <?php echo Filters::noXSS(L('totalestimatedeffort')); ?>: <?php echo ConvertSeconds($total_estimated *60 *60); ?>
+    </br>
+    <?php echo Filters::noXSS(L('opentasks')); ?> - <?php echo Filters::noXSS(L('actualeffort')); ?>: <?php echo ConvertSeconds($actual_effort); ?>
+    <?php } ?>
+</p>
+
+<?php if(count($milestone['open_tasks'])): ?>
+<dl class="roadmap">
+    <?php foreach($milestone['open_tasks'] as $task): ?>
+      <dt class="severity<?php echo Filters::noXSS($task['task_severity']); ?>">
+        <?php echo tpl_tasklink($task['task_id']); ?>
+
+        <small class="DoNotPrint">
+          <a id="expand<?php echo Filters::noXSS($task['task_id']); ?>" href="javascript:showstuff('dd<?php echo Filters::noXSS($task['task_id']); ?>');hidestuff('expand<?php echo Filters::noXSS($task['task_id']); ?>');showstuff('hide<?php echo Filters::noXSS($task['task_id']); ?>', 'inline')"><?php echo Filters::noXSS(L('expand')); ?></a>
+          <a class="hide" id="hide<?php echo Filters::noXSS($task['task_id']); ?>" href="javascript:hidestuff('dd<?php echo Filters::noXSS($task['task_id']); ?>');hidestuff('hide<?php echo Filters::noXSS($task['task_id']); ?>');showstuff('expand<?php echo Filters::noXSS($task['task_id']); ?>', 'inline')"><?php echo Filters::noXSS(L('collapse')); ?></a>
+        </small>
+      </dt>
+      <dd id="dd<?php echo Filters::noXSS($task['task_id']); ?>" style="display: none;">
+        <?php echo TextFormatter::render($task['detailed_desc'], 'rota', $task['task_id'], $task['content']); ?>
+
+        <br style="position:absolute;" />
+      </dd>
+    <?php endforeach; ?>
+</dl>
+
+<?php endif; ?>
+</div>
+<?php endforeach; ?>
+
+<?php if (!count($data)): ?>
+<div class="box roadmap">
+<p><em><?php echo Filters::noXSS(L('noroadmap')); ?></em></p>
+</div>
+<?php else: ?>
+<p><a href="<?php echo Filters::noXSS(CreateURL('roadmap', $proj->id, null, array('txt' => 'true'))); ?>">
+<!--<img src="<?php echo Filters::noXSS($this->get_image('mime/text')); ?>" alt="" />--> <?php echo Filters::noXSS(L('textversion')); ?></a></p>
+<?php endif; ?>
diff --git a/templates/toplevel.tpl b/templates/toplevel.tpl
new file mode 100644
index 0000000..dd02c12
--- /dev/null
+++ b/templates/toplevel.tpl
@@ -0,0 +1,105 @@
+<?php $project_count = count($projects);
+
+/* If user has no projects, just redirect them to the index page of All Projects */
+if (!$project_count): ?>
+  <meta http-equiv="Refresh" content="0;url=/index.php?project=0&do=index" />
+<?php endif; ?>
+<?php
+foreach ($projects as $project): ?>
+<div class="box<?php if ($project_count == 1) echo ' single-project' ?>">
+<h2><a href="<?php echo Filters::noXSS(CreateUrl('project', $project['project_id'])); ?>"><?php echo Filters::noXSS($project['project_title']); ?></a></h2>
+
+<table class="toplevel">
+  <tr>
+    <th><strong><?php echo Filters::noXSS(L('viewtasks')); ?></strong></th>
+    <td>
+        <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=index&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>&amp;status[]="><?php echo Filters::noXSS(L('All')); ?></a> -
+        <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=index&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>&amp;status[]=open"><?php echo Filters::noXSS(L('open')); ?></a> -
+        <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=index&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>&amp;openedfrom=-1+week"><?php echo Filters::noXSS(L('recentlyopened')); ?></a>
+        <?php if (!$user->isAnon()): ?>
+          <br />
+          <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=index&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>&amp;dev=<?php echo Filters::noXSS($user->id); ?>"><?php echo Filters::noXSS(L('assignedtome')); ?></a> -
+          <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=index&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>&amp;only_watched=1"><?php echo Filters::noXSS(L('taskswatched')); ?></a> -
+          <a href="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?do=index&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>&amp;opened=<?php echo Filters::noXSS($user->id); ?>"><?php echo Filters::noXSS(L('tasksireported')); ?></a>
+        <?php endif; ?>
+    </td>
+    
+    <?php if ($project_count == 1 and isset($most_wanted[$project['project_id']])): ?>
+    <td rowspan="4">
+      <strong><?php echo Filters::noXSS(L('mostwanted')); ?></strong>
+        <ul>
+            <?php foreach($most_wanted[$project['project_id']] as $task): ?>
+            <li><?php echo tpl_tasklink($task['task_id']); ?>, <?php echo Filters::noXSS($task['num_votes']); ?> <?php echo Filters::noXSS(L('vote(s)')); ?></li>
+            <?php endforeach; ?>
+        </ul>
+    </td>
+    <?php endif; ?>
+    <?php if ($project_count == 1 and isset($assigned_to_myself[$project['project_id']])): ?>
+    <td rowspan="4">
+      <strong><?php echo Filters::noXSS(L('assignedtome')); ?></strong>
+        <ul>
+            <?php foreach($assigned_to_myself[$project['project_id']] as $task): ?>
+            <li><?php echo tpl_tasklink($task['task_id']); ?></li>
+            <?php endforeach; ?>
+        </ul>
+    </td>
+    <?php endif; ?>
+
+  </tr>
+  <?php if (!$user->isAnon()): ?>
+  <tr>
+  	<th><strong>Activity</strong>
+  	<td><img src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=0066CC&amp;do=activity&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>&amp;graph=project"/></td>
+  </tr>
+ 
+  <tr>
+  	<th><strong>My Activity</strong>
+  	<td><img src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=0066CC&amp;do=activity&amp;user_id=<?php echo Filters::noXSS($user->id); ?>&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>&amp;graph=user"/></td>
+  </tr>
+  <?php endif; ?>
+  <?php if ($user->isAnon()): ?>
+    <tr>
+  	<th><strong>Activity</strong>
+  	<td><img src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=0066CC&amp;do=activity&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>"/></td>
+  </tr>
+  <?php endif; ?>
+  <tr>
+    <th><strong><?php echo Filters::noXSS(L('stats')); ?></strong></th>
+    <td><?php echo Filters::noXSS($stats[$project['project_id']]['open']); ?> <?php echo Filters::noXSS(L('opentasks')); ?>, <?php echo Filters::noXSS($stats[$project['project_id']]['all']); ?> <?php echo Filters::noXSS(L('totaltasks')); ?>.</td>
+  </tr>
+  <tr>
+    <th><strong><?php echo Filters::noXSS(L('progress')); ?></strong></th>
+    <td>
+        <?php echo Filters::noXSS($stats[$project['project_id']]['average_done']); ?>% <?php echo Filters::noXSS(L('done')); ?>
+
+        <?php $progressbar_value = $stats[$project['project_id']]['average_done']; ?>
+
+        <div class="progress_bar_container">
+          <span><?php echo Filters::noXSS($stats[$project['project_id']]['average_done']); ?>%</span>
+          <div class="progress_bar" style="width:<?php echo Filters::noXSS($stats[$project['project_id']]['average_done']); ?>%"></div>
+        </div>        
+    </td>
+  </tr>
+  <tr>
+    <th><strong><?php echo Filters::noXSS(L('feeds')); ?></strong></th>
+    <td>
+        <b><?php echo Filters::noXSS(L('rss')); ?> 1.0</b> <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss1&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('opened')); ?></a> - 
+        <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss1&amp;topic=edit&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('edited')); ?></a> - 
+        <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss1&amp;topic=clo&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('closed')); ?></a>
+        <br />
+        <b><?php echo Filters::noXSS(L('rss')); ?> 2.0</b> <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss2&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('opened')); ?></a> - 
+        <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss2&amp;topic=edit&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('edited')); ?></a> -
+        <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=rss2&amp;topic=clo&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('closed')); ?></a>
+        <br />
+        <b><?php echo Filters::noXSS(L('atom')); ?></b> <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=atom&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('opened')); ?></a> -
+        <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=atom&amp;topic=edit&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('edited')); ?></a> -
+        <a href="<?php echo Filters::noXSS($baseurl); ?>feed.php?feed_type=atom&amp;topic=clo&amp;project=<?php echo Filters::noXSS($project['project_id']); ?>"><?php echo Filters::noXSS(L('closed')); ?></a>
+    </td>
+  </tr>
+</table>
+</div>
+<?php
+endforeach;
+?>
+
+<div class="clear"></div>
diff --git a/theme.css b/theme.css
new file mode 100644
index 0000000..f19e218
--- /dev/null
+++ b/theme.css
@@ -0,0 +1,1779 @@
+/* ------------------ IMPORTS -------------------- */
+@import url("../../js/jscalendar/calendar-system.css");
+/*@import url("calendar.css");*/
+@import url("reset.css");
+@import url("typography.css");
+/* ----------------- VARIABLES --------------------- */
+/*$far_background: #dcdcdc;*/
+/*$far_background: #ededed;*/
+/*$top1: lighten(#292626, 2%);*/
+/*$dominant: #2C6FB2;*/
+/*$dominant: #A82F21;*/
+/*$link: #0066CC;*/
+/*lighten(#F9F2F2, 1%);*/
+/* ----------------- MIXINS --------------------- */
+/* ------------------ HELPER CLASSES -------------------- */
+
+.hide {
+  display: none;
+  visibility: hidden; }
+
+
+.clear {
+  clear: both; }
+
+
+.fade {
+  color: gray;
+  background: pink !important;
+  border: 1px solid blue !important; }
+
+
+.search_hit {
+  background: red !important;
+  border: 1px solid green !important; }
+
+
+img:-moz-broken {
+  /* show broken images */
+  -moz-force-broken-image-icon: 1;
+  width: 24px;
+  height: 24px;
+  border: solid 2px red; }
+
+
+div.popup {
+  position: absolute;
+  background: #fafafa;
+  border: #e1e1e1 1px solid;
+  margin-top: 5px;
+  padding: 5px;
+  -moz-box-shadow: 0px 1px 2px #f9f9f9;
+  -webkit-box-shadow: 0px 1px 2px #f9f9f9;
+  box-shadow: 0px 1px 2px #f9f9f9;
+  -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color')";
+  filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color'); }
+
+
+
+
+
+/* ------------------ STYLE -------------------- */
+
+html, body {
+  height: 100%;
+  margin: 0 0 1px;
+  padding: 0; }
+
+
+body {
+  background: #f9f9f9; 
+ /* direction:rtl;*/
+}
+
+
+a {
+  color: #336699; }
+
+
+a:hover {
+  color: #6699cc;
+  color: #466f1e;}
+
+
+#container {
+  min-width: 1000px;
+  position: relative; 
+  text-align: left;}
+
+
+#content {
+  padding: 10px 20px 10px 20px;
+  min-width: 660px; }
+
+
+#footer {
+  display: block;
+  margin: 0px 20px 20px 20px;
+  padding-top: 10px;
+  border-top: #e1e1e1 solid 1px;
+  text-align: right; }
+
+
+#title {
+  height: 120px;
+  background-color: #3c4041;
+  /* fallback/image non-cover color */
+  background-image: -moz-linear-gradient(#3c4041, #242627);
+  /* Firefox 3.6+ */
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#3c4041), to(#242627));
+  /* Safari 4+, Chrome 1+ */
+  background-image: -webkit-linear-gradient(#3c4041, #242627);
+  /* Safari 5.1+, Chrome 10+ */
+  background-image: -o-linear-gradient(#3c4041, #242627);
+  /* Opera 11.10+ */
+  border-bottom: 1px solid #6cab2e;
+  /*border-bottom: 4px solid $dominant;*/
+  margin: 0; }
+
+  #title a {
+    color: white;
+    text-decoration: none;
+    display: block;
+    padding: 25px 50px;
+    float: left;
+    width: 50%; }
+
+  #title img {
+    float: left;
+    margin-right: 20px;
+    height: 36px;}
+
+
+#menu {
+  position: absolute;
+  top: 5px;
+  right: 5px; }
+
+  #menu #menu-list {
+    display: inline;
+    margin: 0;
+    padding: 0;
+    list-style: none; }
+
+    #menu #menu-list a {
+      color: #dddddd;
+      text-decoration: none;
+      padding: 3px 7px; }
+
+    #menu #menu-list a:hover {
+      background: #494d4e;
+      border-radius: 10px;
+      -moz-border-radius: 10px;
+      -webkit-border-radius: 10px; }
+
+    tr.active, #menu #menu-list a.active {
+      /*background: $inverse_link;      */
+      color: white;
+      background: #5f9729;
+      border-radius: 10px;
+      -moz-border-radius: 10px;
+      -webkit-border-radius: 10px; }
+
+    #menu #menu-list a#lastsearchlink.active {
+      border-radius: 10px 10px 0px 0px;
+      -moz-border-radius: 10px 10px 0px 0px;
+      -webkit-border-radius: 10px 10px 0px 0px; }
+
+    #menu #menu-list li {
+      display: block;
+      padding: 0px 2px;
+      float: left;
+      height: 1.4em;
+      border-left: dotted 1px #888888; }
+
+    #menu #menu-list li.first {
+      border: none; }
+
+    #menu #menu-list #locked {
+      margin-left: 7px; 
+      color: red }
+
+
+div#mysearches {
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #dddddd;
+  border: solid 3px #5f9729;
+  width: 218px;
+  overflow: auto;
+  max-height: 25em;
+  display: none;
+  position: absolute;
+  left: 0;
+  top: 1.4em;
+  margin-top: 1px;
+  z-index: 5;
+  padding: 2px 5px 3px; }
+
+  div#mysearches table#mysearchestable {
+    border-collapse: collapse;
+    width: 100%;
+    margin-bottom: 0; }
+
+    div#mysearches table#mysearchestable a {
+      color: #3c4041;
+      font-weight: normal; }
+
+    div#mysearches table#mysearchestable a:hover {
+      background: none;
+      text-decoration: underline; }
+
+  div#mysearches .searches_delete {
+    width: 20px; }
+
+  div#mysearches a {
+    padding: 0 0 0 0.2em;
+    font-weight: bold; }
+
+  div#mysearches table tr {
+    border-bottom: dotted 1px gray;
+    text-align: left;
+    padding: 0.1em 0; }
+
+  div#mysearches table tr.last {
+    border: 0; }
+
+  div#mysearches td {
+    vertical-align: middle; }
+
+
+#pmcontrol {
+  position: absolute;
+  right: 20px;}
+
+
+#pmcontrol div {
+  display: -moz-inline-stack;
+  /* optional */
+  display: inline-block;
+  zoom: 1;
+  /* triggers hasLayout for IE */
+  *display: inline;
+  /* target IE7 only */ }
+
+
+#showtask #taskid {
+  width: 50px; }
+
+
+#projectselector {
+  /*margin-top: 3px;*/
+  margin-right: 10px; }
+
+  #projectselector button {
+    margin-bottom: 2px; }
+
+  #projectselector option[selected] {
+    font-weight: bold; }
+
+
+#pm-menu {
+  height: 40px;
+  position: absolute;
+  top: 81px;
+  width: 100%;
+  min-width: 660px; }
+
+  #pm-menu #pm-menu-list {
+    list-style: none;
+    height: 40px;
+    border-bottom: solid 4px #5f9729;
+    margin: 0;
+    padding: 0px 0px 0px 10px; }
+
+    #pm-menu #pm-menu-list li {
+      display: block;
+      float: left; }
+
+      #pm-menu #pm-menu-list li a {
+        display: block;
+        line-height: 1.4em;
+        padding: 11px 11px 8px 35px;
+        margin-right: 2px;
+        color: #f9f9f9;
+        text-decoration: none;
+        border-left: dotted 1px #3c4041;
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+        background-repeat: no-repeat;
+        background-position: 12px 50%; }
+
+      #pm-menu #pm-menu-list li a:hover {
+        background-color: #3c4041;
+        border-left: 1px solid #3c4041; }
+
+      #pm-menu #pm-menu-list li a.active {
+        /*color: darken($top2, 10%);*/
+        background-color: #5f9729;
+        border-left: none;
+        border-bottom: 3px solid #5f9729;
+        border-top: 1px solid #6cab2e;
+        border-right: 1px solid #6cab2e; }
+
+    #pm-menu #pm-menu-list li.first a {
+      border-left: none; }
+
+
+#toplevellink {
+  background-image: url("img/gray/folder_stroke_12x12.png"); }
+
+
+#homelink {
+  background-image: url("img/gray/list_12x11.png"); }
+
+
+#newtasklink {
+  background-image: url("img/gray/document_alt_stroke_9x12.png"); }
+#newmultitaskslink {
+	  background-image: url("img/gray/document_alt_stroke_9x12.png"); }
+
+#reportslink {
+  background-image: url("img/gray/calendar_alt_stroke_12x12.png"); }
+
+
+#roadmaplink {
+  background-image: url("img/gray/compass_12x12.png"); }
+
+
+#projectslink {
+  background-image: url("img/gray/cog_alt_12x12.png"); }
+
+
+.active#toplevellink {
+  background-image: url("img/white/folder_stroke_12x12.png"); }
+
+
+.active#homelink {
+  background-image: url("img/white/list_12x11.png"); }
+
+
+.active#newtasklink {
+  background-image: url("img/white/document_alt_stroke_9x12.png"); }
+
+
+.active#reportslink {
+  background-image: url("img/white/calendar_alt_stroke_12x12.png"); }
+
+
+.active#roadmaplink {
+  background-image: url("img/white/compass_12x12.png"); }
+
+
+.active#projectslink {
+  background-image: url("img/white/cog_alt_12x12.png"); }
+
+/* --- buttons --- */
+
+#actionbar {
+  /*height: 4em;*/
+  position: relative; }
+
+  #actionbar a.button {
+    margin-bottom: 0; }
+
+  #actionbar button.button {
+    margin-bottom: 0; }
+
+  #actionbar .main {
+    float: right; }
+
+
+a.button, button.button {
+  display: -moz-inline-stack;
+  /* optional */
+  display: inline-block;
+  zoom: 1;
+  /* triggers hasLayout for IE */
+  *display: inline;
+  /* target IE7 only */
+  margin: 0.3em 0.3em 0.3em 0;
+  padding: 8px 13px 8px 10px;
+  /* Links */
+  border: 1px solid #bbbbbb;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-box-shadow: 0px 1px 1px #dddddd;
+  -webkit-box-shadow: 0px 1px 1px #dddddd;
+  box-shadow: 0px 1px 1px #dddddd;
+  -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color')";
+  filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color');
+  background-color: white;
+  font-family: "Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+  font-size: 100%;
+  line-height: 130%;
+  text-decoration: none;
+  font-weight: bold;
+  color: #565656;
+  cursor: pointer; }
+
+  a.button img, button.button img {
+    margin: 0 3px -3px 0 !important;
+    padding: 0;
+    border: none;
+    width: 16px;
+    height: 16px;
+    float: none; }
+
+
+a.button:hover, button.button:hover {
+  background-color: #f2f2f2;
+  border: 1px solid #a1a1a1; }
+
+a.button.disabled{
+  background-color: #f2f2f2;
+  border: 1px solid #a1a1a1;
+  color: #9e9e9e;
+}
+
+
+
+a.button:active, button.button:active {
+  background-color: #6299c5;
+  border: 1px solid #6299c5;
+  color: #fff; }
+
+
+body .positive {
+  /*color: white;*/
+  /*background: lighten(#5F9729, 10%);*/
+  background-color: #d2ecb9;
+  border: solid 1px #5a8f27;
+  border-top: solid 1px #85cb41;
+  border-right: solid 1px #85cb41; }
+
+
+a.positive:hover, button.positive:hover {
+  background-color: #78bf34;
+  border: solid 1px #5f9729;
+  color: #529214;
+  color: white; }
+
+
+a.positive:active, button.positive:active {
+  background-color: #529214;
+  border: 1px solid #529214;
+  color: #fff; }
+
+
+body .negative {
+  color: #d12f19; }
+
+
+a.negative:hover {
+  background-color: #fbe3e4;
+  border: 1px solid #fbc2c4;
+  color: #d12f19; }
+
+
+a.negative:active {
+  background-color: #d12f19;
+  border: 1px solid #d12f19;
+  color: #fff; }
+
+
+#intromessage {
+  display: block; }
+
+
+#tasklist {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+  #tasklist table {
+    width: 100%; }
+
+  #tasklist tr:nth-child(2n-1) {
+    background-color: #f5f5f5; }
+
+
+#search {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+  #search fieldset {
+    margin: 10px 0px 10px 0px;
+    padding: 10px;
+    background: white;
+    border: solid 1px #e1e1e1;
+    border-radius: 3px; }
+
+
+#intromessage {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+
+body.toplevel .box {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px;
+  margin: 10px 0 0 10px;
+  width: 400px;
+  height: 275px;
+  /*height: 280px;*/
+  /*@include inline-block;*/
+  /*vertical-align: middle;*/
+  float: left; }
+
+
+body.toplevel .single-project {
+  width: auto;
+  float: none;
+  display: block;
+  height: auto; }
+
+
+.progress_bar_container {
+  width: 150px;
+  margin: 0 5px;
+  border: solid 1px #000;
+  height: 11px;
+  position: relative;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  display: -moz-inline-stack;
+  /* optional */
+  display: inline-block;
+  zoom: 1;
+  /* triggers hasLayout for IE */
+  *display: inline;
+  /* target IE7 only */
+  vertical-align: sub; }
+
+  .progress_bar_container .progress_bar {
+    height: 100%;
+    background: #5f9729;
+    border-right: 1px solid #2d4713;
+    position: absolute;
+    left: 0;
+    top: 0;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    background-color: #acdc7d;
+    /* fallback/image non-cover color */
+    background-image: -moz-linear-gradient(#acdc7d, #78bf34);
+    /* Firefox 3.6+ */
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#acdc7d), to(#78bf34));
+    /* Safari 4+, Chrome 1+ */
+    background-image: -webkit-linear-gradient(#acdc7d, #78bf34);
+    /* Safari 5.1+, Chrome 10+ */
+    background-image: -o-linear-gradient(#acdc7d, #78bf34);
+    /* Opera 11.10+ */ }
+
+  .progress_bar_container span {
+    text-align: center;
+    position: absolute;
+    z-index: 100;
+    width: 100%;
+    font-size: 10px;
+    line-height: 1em;
+    text-shadow: 0 0 6px white; }
+
+
+td.task_progress .progress_bar_container {
+  width: 100%; }
+
+
+a {
+  text-decoration: none; }
+
+
+#tasklist_table {
+  border-bottom: solid 1px #a1a6a8; }
+
+  #tasklist_table th {
+    /*padding: 0 4px;*/
+    background: #3c4041;
+    background: white; }
+
+    #tasklist_table th img {
+      position: relative;
+      top: 2px; }
+
+    #tasklist_table th a {
+      /*color: $inverse_link;*/ }
+
+  #tasklist_table td {
+    cursor: pointer; }
+
+  #tasklist_table tr.current_row td.caret {
+    background-image: url(img/caret.gif);
+    background-repeat: no-repeat;
+    background-position: 3px; }
+
+  #tasklist_table td.caret {
+    width: 15px;
+    padding: 0 !important; }
+
+  #tasklist_table .ttcolumn {
+    width: 10px;
+    text-align: center; }
+
+    #tasklist_table .ttcolumn input {
+      margin: 0; }
+
+    #tasklist_table .ttcolumn a {
+      background-image: url(img/black/loop_alt3_12x9.png);
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 30px;
+      height: 30px;
+      display: block; }
+
+  #tasklist_table thead th {
+    border-bottom: solid 1px #a1a6a8;
+    border-top: solid 1px #a1a6a8; }
+
+
+a.toggle_selected {
+  background-image: url(img/black/loop_alt3_12x9.png);
+  background-repeat: no-repeat;
+  background-position: center;
+  width: 30px;
+  height: 30px;
+  display: block; }
+
+
+tr.severity1 .task_severity {
+  background-color: white; }
+
+
+tr.severity2 .task_severity {
+  background-color: white; }
+
+
+tr.severity3 .task_severity {
+  background-color: #f5e7e7; }
+
+
+tr.severity4 .task_severity {
+  background-color: #f5dddd; }
+
+
+tr.severity5 .task_severity {
+  background-color: #f5d1d1; }
+
+
+tr.severity1:hover td {
+  background-color: #f2f2f2 !important; }
+
+
+tr.severity2:hover td {
+  background-color: #f2f2f2 !important; }
+
+
+tr.severity3:hover td {
+  background-color: #eed4d4 !important; }
+
+
+tr.severity4:hover td {
+  background-color: #efc9c9 !important; }
+
+
+tr.severity5:hover td {
+  background-color: #f0bcbc !important; }
+
+
+div#toolbox {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px;
+  margin-left: 120px;
+  min-height: 450px;
+  height: 1%;
+  /* Fix for IE bug */
+  padding: 20px; }
+
+  div#toolbox div.tab {
+    margin: 10px 0px 10px 0px;
+    padding: 10px;
+    background: white;
+    border: solid 1px #e1e1e1;
+    border-radius: 3px; }
+
+  div#toolbox h3 {
+    margin-bottom: 1em;
+    padding-bottom: 5px;
+    border-bottom: 1px solid #ddd; }
+
+
+div#toolboxmenu {
+  position: relative;
+  float: left;
+  padding-top: 10px; }
+
+  div#toolboxmenu a {
+    display: block;
+    border: 1px solid #d4d4d4;
+    /*border-right: none; */
+    padding: 1em 5px;
+    margin-left: 10px;
+    width: 100px;
+    text-align: center;
+    background: #e5e5e5;
+    color: #3c4041;
+    border-top-left-radius: 5px;
+    -moz-border-top-left-radius: 5px;
+    -webkit-border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+    -moz-border-bottom-left-radius: 5px;
+    -webkit-border-bottom-left-radius: 5px; }
+
+  div#toolboxmenu a:hover {
+    background-color: #d6d8d9;
+    /*color: $inverse_link;*/ }
+
+  div#toolboxmenu a.active {
+    margin-left: 0;
+    font-weight: bold;
+    width: 100px;
+    padding: 1em 10px;
+    background-color: white;
+    color: #3c4041;
+    border: 1px solid #e1e1e1;
+    border-right: none;
+    /*border-left: 1px solid lighten($top1, 30%);*/
+    border-left: 2px solid #78bf34; }
+
+
+#controlBox {
+  border: 1px solid gray;
+  padding: 1px;
+  background: #fff;
+  width: auto !important;
+  width: 90px;
+  margin-left: 40px;
+  display: table;
+  position: absolute; }
+
+  #controlBox div.grip {
+    background: #ccc;
+    cursor: move;
+    height: 12px; }
+
+  #controlBox div.inner {
+    padding: 5px 5px 4px 5px;
+    white-space: nowrap;
+    opacity: .2; }
+
+
+#controlBox.active div.inner {
+  opacity: 1; }
+
+
+div#fineprint {
+  /*border-top: 1px solid $box_border;*/
+  font-size: smaller;
+  margin: 5px 0;
+  padding: 10px 5px 10px 20px;
+  color: #555555; }
+
+
+form #taskdetails #taskfields {
+  width: 335px; }
+
+form #taskdetails #taskdetailsfull {
+  position: relative; 
+  top: -20px;
+  margin-left: 355px;}
+
+
+#taskdetails {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+  #taskdetails #navigation {
+    float: right; }
+
+  #taskdetails h2 {
+    color: #555555; }
+
+  #taskdetails #taskfields {
+    width: 290px;
+    float: left;
+    border-right: 1px solid #eeeeee;
+    padding-top: 5px;
+    background: #f9f9f9;
+    margin: -10px; }
+
+    #taskdetails #taskfields ul.fieldslist {
+      margin-bottom: 35px;
+      list-style: none;
+      margin-right: 1ex;
+      padding-left: 1ex; }
+
+      #taskdetails #taskfields ul.fieldslist li {
+        clear: both;
+        margin-top: 2%;
+        padding-top: 1%;
+        padding-bottom: 1%;
+        overflow: auto;
+        width: 100%;
+        border-radius: 4px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px; }
+
+        #taskdetails #taskfields ul.fieldslist li .label {
+          display: block;
+          float: left;
+          width: 45%;
+          text-align: right;
+          color: #888888; }
+
+        #taskdetails #taskfields ul.fieldslist li .value {
+          display: block;
+          float: right;
+          width: 50%; }
+
+      #taskdetails #taskfields ul.fieldslist > li:nth-child(2n-1) {
+        background-color: #f1f1f1; }
+
+  #taskdetails #showvotes {
+    position: absolute;
+    margin: 10px 0px 10px 0px;
+    padding: 10px;
+    background: white;
+    border: solid 1px #e1e1e1;
+    border-radius: 3px; }
+
+    #taskdetailsfull {
+    margin-left: 300px;
+    padding: 2em 3em; }
+
+   #taskinfo {
+    margin-left: 300px;
+    margin-top: 15px;
+    border-top: 1px solid #e1e1e1;
+    padding: 8px 5px; }
+
+
+#comments, #related, #notify, #remind, #history {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+#comments h4 {
+  margin:1em 0 0.5em 0;
+}
+
+.userlist th {
+  background-color: #e0e0e0; }
+
+.userlist tr:nth-child(2n-1) td {
+  background-color: #f1f1f1; }
+
+
+#related .related {
+  float: left;
+  margin-right: 0; }
+  
+#duplicate_tasks th
+{
+  height: 30px;
+}
+
+
+#content > #submenu {
+  /*margin-left: $twocol_content_margin;*/ }
+
+
+#submenu {
+  margin-bottom: 0;
+  height: 25px; }
+
+  #submenu a {
+    border: 1px solid #d4d4d4;
+    background: #e5e5e5;
+    color: #3c4041;
+    display: block;
+    float: left;
+    height: 21px;
+    margin: 4px 0 0 2px;
+    padding: 7px 10px 1px 10px;
+    border-top-left-radius: 5px;
+    -moz-border-top-left-radius: 5px;
+    -webkit-border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    -moz-border-top-right-radius: 5px;
+    -webkit-border-top-right-radius: 5px; }
+
+  #submenu a:hover {
+    background-color: #d6d8d9; }
+
+  #submenu a.active {
+    height: 26px;
+    margin-top: 0;
+    font-weight: bold;
+    border-bottom: 1px solid white;
+    border-right: bottom;
+    /*border-top: 1px solid lighten($top1, 30%);*/
+    border-top: 2px solid #78bf34;
+    background-color: white;
+    z-index: 5; }
+
+  #submenu li {
+    display: inline; }
+
+
+div.tab {
+  margin: 10px 1ex 10px 0;
+  padding: 1ex 1ex 0; }
+
+
+* html .tab div.clear {
+  clear: none;
+  height: 14em; }
+
+
+div.comment_container {
+  padding-bottom: 5px;
+  margin-bottom: 5px;
+  border-bottom: 1px solid #e1e1e1; }
+
+  div.comment_container em {
+    display: block;
+    float: left;
+    width: 200px;
+    margin: 10px 0px 10px 0px;
+    padding: 10px;
+    background: white;
+    border: solid 1px #e1e1e1;
+    border-radius: 3px;
+    background-color: #fefefe; }
+
+  div.comment_container .commenttext em {
+      display: block;
+      float: none;
+      width: 100%;
+      margin: 0px 0px 0px 0px;
+      padding: 0px;
+      background: white;
+      border: none 0px #e1e1e1;
+      border-radius: 0px;
+      background-color: #fefefe; }
+
+  div.comment_container .commenttext p{
+      margin: .5em 0 .5em 0;
+      padding: 0 0 0 0;
+  }
+
+
+
+  div.comment_container .comment {
+    margin-left: 235px; }
+
+  div.comment_container .attachments {
+    margin: 10px 0px 10px 0px;
+    padding: 10px;
+    background: white;
+    border: solid 1px #e1e1e1;
+    border-radius: 3px;
+    width: 350px;
+    background-color: #fefefe;
+    background-image: url(img/gray/pin_24x24.png);
+    background-repeat: no-repeat;
+    background-position: 340px 5px; }
+
+    div.comment_container .attachments img {
+      position: relative;
+      top: 4px; }
+
+  div.comment_container .commentlink {
+    background-image: url(img/gray/comment_stroke_16x14.png);
+    background-repeat: no-repeat;
+    display: block;
+    float: left;
+    height: 14px;
+    width: 16px;
+    margin: 2px 4px 0 2px; }
+
+  div.comment_container .commentlink:hover {
+    background-image: url(img/black/comment_stroke_16x14.png); }
+
+
+textarea {
+  width: 99%; }
+
+
+#events {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+.eventlist {
+  height: 150px;
+}
+
+table th {
+  vertical-align: middle; }
+
+table td {
+  vertical-align: top; }
+
+
+div.box, p.box {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+
+div.roadmap {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+
+div.error, div.success, div.mixed {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px;
+  z-index: 50;
+  margin: 20px 20px 0 20px;
+  color: white;
+  position: absolute;
+  top: -10px;
+  width: 30%;
+  left: 35%; }
+
+
+div.error {
+  background: #ffe6e2 url(img/red/x_alt_24x24.png) no-repeat 9px 7px;
+  border: solid 1px #962E21;
+  padding-left: 50px;
+  color: #4b1710; }
+
+
+div.mixed {
+  background: #ffcc00 url(frown.png) no-repeat 5px 1px; }
+
+
+div.success {
+  background: #e8f9d4 url(img/green/check_24x20.png) no-repeat 10px 9px;
+  border: solid 1px #53821F;
+  padding-left: 50px;
+  color: #24380d; }
+
+
+a#show_loginbox {
+  margin-right: 5px; }
+
+
+#menu a#show_loginbox.active {
+  border-radius: 10px 10px 0 0; }
+
+
+#loginbox {
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #dddddd;
+  border: solid 3px #5f9729;
+  right: 5px;
+  z-index: 200;
+  width: 450px;
+  padding-top: 15px;
+  margin-top: 1px;
+  top: 1.4em;
+  box-shadow: none; }
+
+  #loginbox #login label {
+    color: #222222; }
+
+  #loginbox #login a {
+    color: #222222;
+    text-decoration: underline; }
+  #loginbox #login a:hover {color: #fff;}
+
+
+form#login {
+  position: relative; }
+
+  form#login #lbl_user_name, form#login #lbl_password {
+    width: 90px; }
+
+  form#login label {
+    width: 50px;
+    color: #dddddd;
+    width: 100px;
+    margin: 0 2px 0 20px; }
+
+  form#login #links {
+    position: absolute;
+    top: 30px;
+    left: 20px; }
+
+    form#login #links a {
+      padding: 3px 7px; }
+
+    form#login #links a:hover {
+      background: #494d4e;
+      text-decoration: none;
+      color: #dddddd;
+      border-radius: 10px;
+      -moz-border-radius: 10px;
+      -webkit-border-radius: 10px; }
+
+    form#login #links a.active {
+      background: #dddddd;
+      color: #3c4041;
+      border-radius: 10px;
+      -moz-border-radius: 10px;
+      -webkit-border-radius: 10px; }
+
+  form#login .remember_me {
+    float: right;}
+
+
+
+span#advancedsearchstate img {
+  vertical-align: middle; }
+
+
+fieldset {
+  margin: 10px 0px 10px 0px;
+  padding: 10px;
+  background: white;
+  border: solid 1px #e1e1e1;
+  border-radius: 3px; }
+
+
+#content > fieldset legend {
+  color: #3c4041;
+  background: #f9f9f9;
+  padding: 2px 9px;
+  border: solid 1px #e1e1e1;
+  /*border-bottom: solid 1px $box_border;*/
+  border-radius: 10px;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px; }
+
+
+#content > h3 {
+  margin-top: 1em; }
+
+
+thead th {
+  border-bottom: solid 1px #a1a6a8;
+  border-top: solid 1px #a1a6a8;
+  background: none; }
+
+
+div#taskinfo {
+  /*width:98%;*/ }
+
+
+div#taskstatus {
+  border-bottom: 1px solid #ccc;
+  padding: 4px;
+  margin-bottom: 5px; }
+
+
+div#taskclosed {
+  padding: 5px;
+  margin: 5px 5px 10px;
+  clear: both;
+  width: 20em;
+  background: white;
+  border: solid 1px red; }
+
+
+div#taskdeps {
+  float: left;
+  width: 50%;
+  margin-bottom: 8px; }
+
+div#subtasks {
+  display: inline; 
+  align: right;
+  float: left;
+  width: 50%;
+  margin-bottom: 8px; }
+
+
+div#taskblocks {
+  float: left;
+  width: 45%; }
+
+
+a.datelink {
+  background-image: url(img/black/calendar_alt_fill_16x16.png);
+  background-repeat: no-repeat;
+  display: -moz-inline-stack;
+  /* optional */
+  display: inline-block;
+  zoom: 1;
+  /* triggers hasLayout for IE */
+  *display: inline;
+  /* target IE7 only */
+  height: 16px;
+  width: 16px;
+  vertical-align: middle; }
+
+hr {
+  /*color: $box_border;*/
+  border: none;
+  border-top: 1px solid #e1e1e1; }
+
+
+div#permissions {
+  width: 22em;
+  visibility: hidden;
+  position: absolute;
+  top: 25px !important;
+  top: 60px;
+  left: 0;
+  margin: 0;
+  z-index: 101;
+  padding: 5px; }
+
+  div#permissions td, div#permissions th {
+    padding: 2px 5px;
+    border: 0;
+    text-align: left;
+    font-weight: 400; }
+
+  div#permissions table {
+    color: #000;
+    background: #fff;
+    border: 1px dotted #000; }
+
+  div#permissions table thead th {
+    font-weight: 700; }
+
+  div#permissions td.good, div#permissions table td.bad {
+    text-align: right; }
+
+
+fieldset.advsearch_misc input {
+  vertical-align: middle; }
+
+fieldset.advsearch_misc label {
+  margin-right: 10px;
+  white-space: nowrap; }
+
+
+fieldset.advsearch_dates label {
+  margin: 0 5px; }
+
+
+.search_select {
+  float: left;
+  position: relative;
+  margin-right: 10px; }
+
+  .search_select .multisel {
+    position: absolute;
+    white-space: nowrap; }
+
+  .search_select select {
+    margin-top: 1.3em;
+    height: 7em; }
+
+
+fieldset.advsearch_users .multisel {
+  position: absolute;
+  white-space: nowrap; }
+
+fieldset.advsearch_users input {
+  margin-top: 1.3em; }
+
+/* --------------------------- FORMS -----------------------*/
+
+.bulkuser {
+  padding-left: 120px;
+}
+
+.account_header{
+	background: #999;
+	border: 1px solid #111;
+}
+.account_enabled{
+	background: #EAF7D9;
+	border: 1px solid #BBDF8D;
+}
+.account_enabled:hover {
+	background: #00FF00;
+}
+.account_disabled{
+	background: #FFD1D1;
+	border: 1px solid #F8ACAC;
+}
+.account_disabled:hover {
+	background: #FF0000;
+}
+
+ul.form_elements {
+  list-style: none;
+  padding: 0;
+  margin: 0 0 0 1em; }
+
+  ul.form_elements li {
+    padding: 2px;
+    margin-bottom: 9px; }
+
+    ul.form_elements li label {
+      width: 200px;
+      display: -moz-inline-stack;
+      /* optional */
+      display: inline-block;
+      zoom: 1;
+      /* triggers hasLayout for IE */
+      *display: inline;
+      /* target IE7 only */
+      vertical-align: top;
+      text-align: right;
+      padding-right: 1ex;
+      padding-top: 2px;
+      color: #555555; }
+
+    ul.form_elements li label.inline {
+      display: inline; }
+
+    ul.form_elements li input {
+      vertical-align: middle; }
+
+    ul.form_elements li textarea {
+      width: 30em; }
+
+  ul.form_elements li.required label {
+    font-weight: bold; }
+
+  ul.form_elements li:hover label {
+    /*text-decoration: underline;*/ }
+
+  ul.form_elements span.note {
+    margin-left: 205px; }
+
+
+ul.wide li label {
+  width: 250px; }
+
+
+ul.slim {
+  width: 390px;
+  margin: 0; }
+
+  ul.slim li label {
+    width: 110px; }
+
+  ul.slim li div.userSelectWidget {
+    display: -moz-inline-stack;
+    /* optional */
+    display: inline-block;
+    zoom: 1;
+    /* triggers hasLayout for IE */
+    *display: inline;
+    /* target IE7 only */
+    vertical-align: middle; }
+
+    ul.slim li div.userSelectWidget input {
+      width: 120px; }
+
+
+.dateselect {
+  clear: both; }
+
+  .dateselect label:first-child {
+    width: 120px;
+    text-align: right;
+    padding-right: 5px;
+    float: left; }
+
+/* fancy dual selects */
+
+.double_select {
+	padding-left: 100px;
+	position: relative;}
+
+  .double_select .dualselect_selectable {
+    height: 220px;
+    width: 40%;
+    display: -moz-inline-stack;
+    /* optional */
+    display: inline-block;
+    zoom: 1;
+    /* triggers hasLayout for IE */
+    *display: inline;
+    /* target IE7 only */
+    vertical-align: middle; }
+
+  .double_select .dualselect_buttons {
+    width: 16%;
+    display: -moz-inline-stack;
+    /* optional */
+    display: inline-block;
+    zoom: 1;
+    /* triggers hasLayout for IE */
+    *display: inline;
+    /* target IE7 only */
+    vertical-align: middle; }
+
+    .double_select .dualselect_buttons button {
+      width: 100%;
+      padding: 3px; }
+
+  .double_select .dualselect_selected {
+    height: 220px;
+    /*min-width: 12em;*/
+    display: -moz-inline-stack;
+    /* optional */
+    display: inline-block;
+    zoom: 1;
+    /* triggers hasLayout for IE */
+    *display: inline;
+    /* target IE7 only */
+    vertical-align: middle;
+    width: 40%; }
+
+    .double_select .dualselect_selected select {
+      width: 100%;
+      height: 80%; }
+
+    .double_select .dualselect_selected button {
+      height: 10%;
+      width: 100%; }
+
+	.double_select .c1 select {
+      height: 24em;
+      min-width: 12em;
+      width: auto;}
+
+	.double_select td {
+	  text-align: center;
+	  vertical-align: middle;}
+
+	  .double_select .c3 button {
+		 height: 2em;
+		 width: 12em;}
+
+	  .double_select .c3 select {
+		height: 20em;
+		min-width: 12em;
+		width: auto;}
+/* closing task form */
+
+div#closeform {
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -moz-box-shadow: 0px 1px 1px #dddddd;
+  -webkit-box-shadow: 0px 1px 1px #dddddd;
+  box-shadow: 0px 1px 1px #dddddd;
+  -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color')";
+  filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color');
+  padding: 2em;
+  position: absolute;
+  right: 5px;
+  top: 3em; }
+
+div#actionsform {
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -moz-box-shadow: 0px 1px 1px #dddddd;
+    -webkit-box-shadow: 0px 1px 1px #dddddd;
+    box-shadow: 0px 1px 1px #dddddd;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color')";
+    filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=90, Color='$color');
+    position: absolute;
+    right: 5px;
+    top: 3em;
+    z-index: 500;
+}
+
+div#actionsform ul {
+    font-family: Arial, Verdana;
+    font-size: 12px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+div#actionsform ul li {
+    display: block;
+    position: relative;
+
+}
+div#actionsform li ul { display: none; }
+div#actionsform ul li a {
+    display: block;
+    text-decoration: none;
+    color: #ffffff;
+    border-top: 1px solid #ffffff;
+    padding: 5px 15px 5px 15px;
+    background: #363a3b;
+    margin-left: 1px;
+    white-space: nowrap;
+}
+div#actionsform ul li a:hover { background: #617F8A; }
+div#actionsform li:hover ul {
+    display: block;
+    position: absolute;
+}
+div#actionsform li:hover li {
+    float: none;
+    font-size: 11px;
+}
+div#actionsform li:hover a { background: #617F8A; }
+div#actionsform li:hover li a:hover { background: #95A9B1; }
+
+
+div#actionsform button{
+    position:absolute;
+    right: 5px;
+}
+
+div#actionsform input{
+    position:absolute;
+    right: 50px;
+}
+
+div#setparentform{
+    background: #363a3b;
+    color:#ffffff;
+    padding-left: 5px;
+}
+
+div#associateform{
+    background: #363a3b;
+    color:#ffffff;
+    padding-left: 5px;
+}
+
+div#adddepform{
+    background: #363a3b;
+    color:#ffffff;
+    padding-left: 5px;
+}
+
+div#taskdeps h4 {
+  margin-bottom:0.3em;
+}
+
+div#taskdeps table {
+  margin:0 0 0.8em -0.2em;
+}
+
+div#taskdeps td {
+  padding:0.2em 0.4em;
+}
+
+div#taskdeps img {
+  vertical-align:middle;
+  margin-top:-1px;
+}
+
+input[type=text], input[type=password], select {
+    color: #000;
+    background: #fff;
+    border: 1px solid #ccc;
+    height: 19px;
+    padding: 2px;
+    vertical-align: middle;
+}
+
+#table input[type=text] {
+    width: 120px;
+}
+
+input[type=submit], button {
+    background: #69C;
+    border:  1px solid #0a4193;
+    color: #fff;
+    cursor: pointer;
+    font-size: 11px;
+    font-weight: bold;
+    line-height: 20px;
+    vertical-align: middle;
+}
+
+input[type=text], input[type=submit], button, select {
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+
+button {vertical-align: middle; margin-bottom: 2px; line-height: 20px;}
+select {height: 23px; vertical-align: middle;}
+
+input[type=submit]:hover, button:hover {
+    background: #5F9729;
+    color: #fff;
+    border-color: #5F9729;
+}
+
+#show_loginbox {
+    background: #494D4E;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+}
+
+#menu #menu-list a#show_loginbox:hover {
+    background-color: #5f9729;
+}
+
+#login_hidelink {
+    float: right;
+    text-align: right;
+}
+
+#login_input {
+    height: 30px;
+}
+
+#login_links {
+    height: 30px;
+    padding: 5px 50px;
+}
+
+#login_button {vertical-align: baseline;}
+
+div.denyform {
+	visibility:hidden;
+	position:absolute;
+	background: none repeat scroll 0 0 #FAFAFA;
+	border: 1px solid #E1E1E1;
+	margin-top:5px;
+	display:block;
+	width:300px;
+	height:auto;
+	padding:5px 30px 5px 5px;
+}
+
+#notify_types {height: 10em;}
+
+#rassigned_to {height: 12em; }
+
+/* Stuff for the autocomplete lists {{{ */
+
+span.autocomplete {
+	background-color:#F5F5F5;
+	position: absolute;
+	width: auto !important;
+	border:1px solid gray;
+	padding: 0px;
+	margin:-1px 0 0;
+	text-align:left;
+	display:block;
+}
+
+span.autocomplete ul {
+	list-style-type: none;
+	margin: 0px;
+	padding: 0px;
+}
+
+span.autocomplete ul li {
+	list-style-type: none;
+	display: block;
+	margin: 0;
+	padding:2px 4px;
+	height: 1.1em;
+	white-space:nowrap;
+}
+
+span.autocomplete ul li span.informal {
+	color: darkgray;
+	font-size:0.9em;
+}
+
+span.autocomplete ul li.selected {
+	background-color: #5F9729;
+	cursor:pointer;
+	color:HighlightText;
+}
+
+#actionbuttons {
+	margin-left: 300px;
+	margin-top: 15px;
+	min-height: 50px;
+	padding: 8px 5px; }
+
+.assignedto {
+	border:0px;
+	border-collapse: collapse;
+}
+
+.assignedto table, .assignedto td {
+	margin:0px;
+	padding:0px;
+	padding-right: 5px;
+	vertical-align: middle;
+}
+.assignedto tr {
+	height: 30px;
+}
+.assignedto img {
+	padding-top: 2px;
+}
+a.tooltip {outline:none; }
+a.tooltip strong {line-height:30px;}
+a.tooltip:hover {text-decoration:none;}
+a.tooltip span {
+    z-index:10;display:none; padding:14px 20px;
+    margin-top:60px; margin-left:-160px;
+    width:240px; line-height:16px;
+}
+a.tooltip:hover span{
+    display:inline; position:absolute;
+    border:2px solid #FFF;  color:#EEE;
+    background:#000;
+}
+.callout {z-index:20;position:absolute;border:0;top:-14px;left:120px;}
+
+/*CSS3 extras*/
+a.tooltip span
+{
+    border-radius:2px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+
+    -moz-box-shadow: 0px 0px 8px 4px #666;
+    -webkit-box-shadow: 0px 0px 8px 4px #666;
+    box-shadow: 0px 0px 8px 4px #666;
+
+    opacity: 0.8;
+}
+/*for float box in ticket list*/
+.descbox {
+	display:none;
+	border: 3px solid #e1e1e1;
+	border-radius: 3px;
+	background: none repeat scroll 0 0 white;
+    	margin: 10px 0;
+    	padding: 10px;
+	height: 144px;
+	width: 400px;
+	position: absolute;
+	z-index: 1000;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	color: #686868;
+	font-weight: normal;
+	text-overflow:ellipsis;
+	overflow:hidden;
+
+span.warning {
+    color: red;
+    font-weight: bold;
+}
diff --git a/theme_print.css b/theme_print.css
new file mode 100644
index 0000000..bd79afd
--- /dev/null
+++ b/theme_print.css
@@ -0,0 +1,29 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 1.0.1
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* print.css */
+body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;}
+.container {background:none;}
+hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
+hr.space {background:#fff;color:#fff;visibility:hidden;}
+h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;}
+code {font:.9em "Courier New", Monaco, Courier, monospace;}
+a img {border:none;}
+p img.top {margin-top:0;}
+blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;}
+.small {font-size:.9em;}
+.large {font-size:1.1em;}
+.quiet {color:#999;}
+.hide {display:none;}
+a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;}
+a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;}
\ No newline at end of file
diff --git a/typography.css b/typography.css
new file mode 100644
index 0000000..3708d0e
--- /dev/null
+++ b/typography.css
@@ -0,0 +1,123 @@
+/* --------------------------------------------------------------
+
+   typography.css
+   * Sets up some sensible default typography.
+
+-------------------------------------------------------------- */
+
+/* Default font settings.
+   The font-size percentage is of 16px. (0.75 * 16px = 12px) */
+html { font-size:100.01%; }
+body {
+  font-size: 75%;
+  color: #222;
+  background: #fff;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+
+/* Headings
+-------------------------------------------------------------- */
+
+h1,h2,h3,h4,h5,h6 { font-weight: normal; color: #111; }
+
+h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; }
+h2 { font-size: 2em; margin-bottom: 0.75em; }
+h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; }
+h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
+h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
+h6 { font-size: 1em; font-weight: bold; }
+
+h1 img, h2 img, h3 img,
+h4 img, h5 img, h6 img {
+  margin: 0;
+}
+
+
+/* Text elements
+-------------------------------------------------------------- */
+
+p           { margin: 0 0 1.5em; }
+/*
+  These can be used to pull an image at the start of a paragraph, so
+  that the text flows around it (usage: <p><img class="left">Text</p>)
+ */
+/*.left       { float: left !important; }*/
+p .left     { margin: 1.5em 1.5em 1.5em 0; padding: 0; }
+/*.right      { float: right !important; }*/
+p .right    { margin: 1.5em 0 1.5em 1.5em; padding: 0; }
+
+a:focus,
+a:hover     { color: #09f; }
+a           { color: #06c; text-decoration: underline; }
+
+blockquote  { margin: 1.5em; color: #666; font-style: italic; }
+strong,dfn  { font-weight: bold; }
+em,dfn      { font-style: italic; }
+sup, sub    { line-height: 0; }
+
+abbr,
+acronym     { border-bottom: 1px dotted #666; }
+address     { margin: 0 0 1.5em; font-style: italic; }
+del         { color:#666; }
+
+pre         { margin: 1.5em 0; white-space: pre; }
+pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
+
+
+/* Lists
+-------------------------------------------------------------- */
+
+li ul,
+li ol  { margin: 0; }
+ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 1.5em; }
+
+ul     { list-style-type: disc; }
+ol     { list-style-type: decimal; }
+
+dl     { margin: 0 0 1.5em 0; }
+dl dt  { font-weight: bold; }
+dd     { margin-left: 1.5em;}
+
+
+/* Tables
+-------------------------------------------------------------- */
+
+/*
+  Because of the need for padding on TH and TD, the vertical rhythm
+  on table cells has to be 27px, instead of the standard 18px or 36px
+  of other elements.
+ */
+table         { margin-bottom: 1.4em; /*width:100%;*/ }
+th            { font-weight: bold; }
+thead th      { background: #c3d9ff; }
+th,td,caption { padding: 4px 10px 4px 5px; }
+/*
+  You can zebra-stripe your tables in outdated browsers by adding
+  the class "even" to every other table row.
+ */
+/*tbody tr:nth-child(even) td,*/
+/*tbody tr.even td  {*/
+/*  background: #e5ecf9;*/
+/*}*/
+tfoot       { font-style: italic; }
+caption     { background: #eee; }
+
+
+/* Misc classes
+-------------------------------------------------------------- */
+
+.small     { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
+.large     { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; }
+.hide      { display: none; }
+
+.quiet     { color: #666; }
+.loud      { color: #000; }
+.highlight { background:#ff0; }
+.added     { background:#060; color: #fff; }
+.removed   { background:#900; color: #fff; }
+
+.first     { margin-left:0; }
+.last      { margin-right:0; padding-right:0; }
+.top       { margin-top:0; padding-top:0; }
+.bottom    { margin-bottom:0; padding-bottom:0; }
diff --git a/up.png b/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..3549df544c5c0f9f7fea8106dbe1e125db7c916d
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X)_J-(hE&{oGvy&?gMxq?zj#KATLw#bma==sl$eE_InBEq
zoZjp?x2NvvLG_Mb^AzM9VlB_~ymZ*f_n_rwQiy6SOI~D%it3K8Cw%u*CLWUa%z79)
zX?elKC8FoNwmewkB3(Ce52L**8~b^iUtN+jzZ$;Noa#S2B9DItWAaStTRYSRvin|5
zv6Nw9Qc&s3KCT&~<)QlS-R7@1W3(2WYf@zKcK#l#!gTc)tGvJ)CLRWUr*lomK5hvB
Px}3q&)z4*}Q$iB}mKtQ6

literal 0
HcmV?d00001

-- 
2.20.1