From 1cceba38230b3976ff884691ef1300ba82a6a9eb Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 6 Mar 2015 23:22:23 +0100
Subject: [PATCH 1/6] EOL

---
 .hgeol | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgeol b/.hgeol
index c7a59fec5..a9766f577 100644
--- a/.hgeol
+++ b/.hgeol
@@ -14,6 +14,8 @@
 **.font = native
 **.scheme = native
 
+**.tpl = native
+
 **.xsd = native
 **.dox = native
 

From fef4f56f1032e5c52c21e338eec36d6075eee6a8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 6 Mar 2015 23:37:21 +0100
Subject: [PATCH 2/6] Synchronize versions

---
 .../3d/plugin_max/nel_export/nel_export.rc    |  88 ++++++-------
 .../nel_patch_converter.rc                    |  18 +--
 .../3d/plugin_max/nel_patch_edit/mods.rc      | 124 +++++++++---------
 .../nel_patch_paint/nel_patch_paint.rc        |  18 +--
 .../vertex_tree_paint.rc                      |  24 ++--
 .../plugin_max/tile_utility/tile_utility.rc   |  88 ++++++-------
 code/web/public_php/ams/templates/layout.tpl  |   4 +-
 7 files changed, 182 insertions(+), 182 deletions(-)

diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
index d01762618..b5eaa964d 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
@@ -54,13 +54,13 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,42,50,14
-    CONTROL         "All",IDC_ALLCHANNEL,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "All",IDC_ALLCHANNEL,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,7,23,10
     CONTROL         "Channel Position",IDC_CHANNELPOS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,23,69,10
     CONTROL         "Channel Rotation",IDC_CHANNELROT,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,34,71,10
-    CONTROL         "Channel Scale",IDC_CHANNELSCA,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Channel Scale",IDC_CHANNELSCA,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,46,62,10
 END
 
@@ -91,11 +91,11 @@ BEGIN
                     10
     CONTROL         "64x",IDC_RADIOSS4,"Button",BS_AUTORADIOBUTTON,15,146,27,
                     10
-    CONTROL         "Shadow",IDC_SHADOW,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Shadow",IDC_SHADOW,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,81,18,42,10
     CONTROL         "Exclude non selected nodes from lighting",IDC_EXCLUDE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,145,10
-    CONTROL         "Show Lumel",IDC_SHOWLUMEL,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Show Lumel",IDC_SHOWLUMEL,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,91,100,55,10
     CONTROL         "Export bg color",IDC_EXPORT_BG_COLOR,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,91,115,63,10
@@ -131,28 +131,28 @@ BEGIN
     GROUPBOX        "LOD Root Properties",IDC_STATIC,5,5,172,95
     LTEXT           "List of lod mesh (ungrowing order):",IDC_STATIC,15,15,
                     108,10,SS_CENTERIMAGE
-    LISTBOX         IDC_LIST1,15,25,111,70,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
+    LISTBOX         IDC_LIST1,15,25,111,70,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
                     WS_TABSTOP
     PUSHBUTTON      "Add..",IDC_ADD,131,25,40,14
     PUSHBUTTON      "Remove",IDC_REMOVE,131,39,40,14
     PUSHBUTTON      "Up",IDC_UP,131,54,40,14
     PUSHBUTTON      "Down",IDC_DOWN,131,68,40,14
     GROUPBOX        "LOD Properties",IDC_STATIC,5,105,172,50
-    CONTROL         "Blend in",IDC_BLEND_IN,"Button",BS_AUTO3STATE | 
+    CONTROL         "Blend in",IDC_BLEND_IN,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,15,121,40,10
-    CONTROL         "Blend out",IDC_BLEND_OUT,"Button",BS_AUTO3STATE | 
+    CONTROL         "Blend out",IDC_BLEND_OUT,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,15,130,45,10
-    CONTROL         "Coarse mesh",IDC_COARSE_MESH,"Button",BS_AUTO3STATE | 
+    CONTROL         "Coarse mesh",IDC_COARSE_MESH,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,15,140,55,10
-    CONTROL         "Dynamic mesh",IDC_DYNAMIC_MESH,"Button",BS_AUTO3STATE | 
+    CONTROL         "Dynamic mesh",IDC_DYNAMIC_MESH,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,80,120,60,10
     LTEXT           "Dist Max:",IDC_STATIC,5,160,45,13,SS_CENTERIMAGE
     EDITTEXT        IDC_DIST_MAX,51,160,45,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Blend length:",IDC_STATIC,80,135,45,13,SS_CENTERIMAGE
-    EDITTEXT        IDC_BLEND_LENGTH,125,135,45,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_BLEND_LENGTH,125,135,45,12,ES_AUTOHSCROLL |
                     ES_NUMBER
     GROUPBOX        "MRM properties",IDC_STATIC,185,5,172,95
-    CONTROL         "Active MRM",IDC_ACTIVE_MRM,"Button",BS_AUTO3STATE | 
+    CONTROL         "Active MRM",IDC_ACTIVE_MRM,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,195,20,60,10
     LTEXT           "Skin reduction",IDC_STATIC,195,35,50,10,SS_CENTERIMAGE
     CONTROL         "Min",IDC_SKIN_REDUCTION_MIN,"Button",BS_AUTORADIOBUTTON,
@@ -170,12 +170,12 @@ BEGIN
     LTEXT           "Dist middle:",IDC_STATIC,260,65,45,13,SS_CENTERIMAGE
     EDITTEXT        IDC_DIST_MIDDLE,305,65,45,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Dist coarsest:",IDC_STATIC,260,80,45,13,SS_CENTERIMAGE
-    EDITTEXT        IDC_DIST_COARSEST,305,80,45,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_DIST_COARSEST,305,80,45,12,ES_AUTOHSCROLL |
                     ES_NUMBER
     GROUPBOX        "LOD Bones",IDC_STATIC,185,105,170,45
     LTEXT           "Disable Distance (0 means always activated) :",
                     IDC_STATIC,190,120,160,10
-    EDITTEXT        IDC_BONE_LOD_DISTANCE,190,130,45,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_BONE_LOD_DISTANCE,190,130,45,12,ES_AUTOHSCROLL |
                     ES_NUMBER
     CONTROL         "Export as Lod character (.clod)",IDC_EXPORT_CLOD,"Button",
                     BS_AUTO3STATE | WS_TABSTOP,190,160,150,10
@@ -197,21 +197,21 @@ BEGIN
                     BS_AUTO3STATE | WS_TABSTOP,27,92,71,10
     CONTROL         "Dynamic Portal",IDC_DYNAMIC_PORTAL,"Button",
                     BS_AUTO3STATE | WS_TABSTOP,27,44,63,10
-    CONTROL         "Clusterize",IDC_CLUSTERIZE,"Button",BS_AUTO3STATE | 
+    CONTROL         "Clusterize",IDC_CLUSTERIZE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,93,5,46,10
-    COMBOBOX        IDC_OCC_MODEL,209,30,123,134,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_OCC_MODEL,209,30,123,134,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
     RTEXT           "Occlusion model",IDC_STATIC,134,30,68,12,SS_CENTERIMAGE
-    COMBOBOX        IDC_OPEN_OCC_MODEL,209,44,123,116,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_OPEN_OCC_MODEL,209,44,123,116,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
     RTEXT           "Open portal occlusion model",IDC_STATIC,112,44,89,10,
                     SS_CENTERIMAGE
     GROUPBOX        "Audio properties",IDC_STATIC,105,19,237,141
     RTEXT           "Sound group",IDC_STATIC,111,86,90,14
-    COMBOBOX        IDC_ENV_FX,209,106,123,87,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_ENV_FX,209,106,123,87,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     RTEXT           "Environment FX",IDC_STATIC,112,106,89,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_SOUND_GROUP,209,86,123,101,CBS_DROPDOWN | CBS_SORT | 
+    COMBOBOX        IDC_SOUND_GROUP,209,86,123,101,CBS_DROPDOWN | CBS_SORT |
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "Father audible",IDC_FATHER_AUDIBLE,"Button",
                     BS_AUTO3STATE | WS_TABSTOP,210,135,61,10
@@ -240,17 +240,17 @@ BEGIN
     GROUPBOX        "Properties for objects without lightmaps",IDC_STATIC,5,
                     80,150,60
     CONTROL         "If checked, use per vertex lighting attenuation else use global lighting attenuation for the object. Doesn't work with per pixel lighting shader.",
-                    IDC_USE_LIGHT_LOCAL_ATTENUATION,"Button",BS_AUTO3STATE | 
+                    IDC_USE_LIGHT_LOCAL_ATTENUATION,"Button",BS_AUTO3STATE |
                     BS_TOP | BS_MULTILINE | WS_TABSTOP,15,95,120,41
     GROUPBOX        "Properties for lights",IDC_STATIC,160,5,185,200
     CONTROL         "RealTime Light. If set, this light will light scene objects.",
-                    IDC_EXPORT_REALTIME_LIGHT,"Button",BS_AUTO3STATE | 
+                    IDC_EXPORT_REALTIME_LIGHT,"Button",BS_AUTO3STATE |
                     BS_TOP | BS_MULTILINE | WS_TABSTOP,170,15,165,20
     CONTROL         "RealTime Sun Light. If set, this DIRECTIONNAL light will be used as sun light to light scene objects.",
-                    IDC_EXPORT_AS_SUN_LIGHT,"Button",BS_AUTO3STATE | BS_TOP | 
+                    IDC_EXPORT_AS_SUN_LIGHT,"Button",BS_AUTO3STATE | BS_TOP |
                     BS_MULTILINE | WS_TABSTOP,170,34,170,25
     CONTROL         "LightMap Light. If set, this light will be used to compute the lightmaps of the project objects.",
-                    IDC_EXPORT_LIGHTMAP_LIGHT,"Button",BS_AUTO3STATE | 
+                    IDC_EXPORT_LIGHTMAP_LIGHT,"Button",BS_AUTO3STATE |
                     BS_TOP | BS_MULTILINE | WS_TABSTOP,170,60,170,20
     LTEXT           "LightMap Animation Name. This is the name of the animation used to flick the light color.",
                     IDC_STATIC,170,135,170,20
@@ -284,7 +284,7 @@ BEGIN
     CONTROL         "Floating Object",IDC_FLOATING_OBJECT,"Button",
                     BS_AUTO3STATE | WS_TABSTOP,5,5,65,12
     GROUPBOX        "Ligoscape",IDC_STATIC,5,100,120,45
-    CONTROL         "Symmetry",IDC_LIGO_SYMMETRY,"Button",BS_AUTO3STATE | 
+    CONTROL         "Symmetry",IDC_LIGO_SYMMETRY,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,11,110,44,12
     LTEXT           "Rotation:",IDC_STATIC,11,125,30,13,SS_CENTERIMAGE
     EDITTEXT        IDC_LIGO_ROTATE,60,126,57,14,ES_AUTOHSCROLL
@@ -313,7 +313,7 @@ BEGIN
     EDITTEXT        IDC_EDIT_INTERFACE_THRESHOLD,221,137,110,14,
                     ES_AUTOHSCROLL
     GROUPBOX        "Bone Scale",IDC_STATIC,5,150,120,60
-    CONTROL         "Enable",IDC_EXPORT_BONE_SCALE,"Button",BS_AUTO3STATE | 
+    CONTROL         "Enable",IDC_EXPORT_BONE_SCALE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,10,160,38,10
     LTEXT           "Bone Reference Name extension:",IDC_STATIC,10,175,110,
                     13,SS_CENTERIMAGE
@@ -332,7 +332,7 @@ BEGIN
     EDITTEXT        IDC_REMANENCE_SAMPLING_PERIOD,266,190,20,14,
                     ES_AUTOHSCROLL
     CONTROL         "Shift texture at start of animation",
-                    IDC_REMANENCE_SHIFTING_TEXTURE,"Button",BS_AUTOCHECKBOX | 
+                    IDC_REMANENCE_SHIFTING_TEXTURE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,207,178,116,9
     LTEXT           "Rollup ratio :",IDC_ROLLUP_RATIO,290,192,41,8
     EDITTEXT        IDC_REMANENCE_ROLLUP_RATIO,332,190,16,14,ES_AUTOHSCROLL
@@ -342,10 +342,10 @@ IDD_VEGETABLE DIALOG DISCARDABLE  0, 0, 360, 200
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Vegetable",IDC_VEGETABLE,"Button",BS_AUTO3STATE | 
+    CONTROL         "Vegetable",IDC_VEGETABLE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,5,5,50,12
     CONTROL         "Alpha Blend ON (double sided)",
-                    IDC_VEGETABLE_ALPHA_BLEND_ON,"Button",BS_AUTORADIOBUTTON | 
+                    IDC_VEGETABLE_ALPHA_BLEND_ON,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,21,30,112,15
     CONTROL         "Alpha Blend OFF",IDC_VEGETABLE_ALPHA_BLEND_OFF,"Button",
                     BS_AUTORADIOBUTTON,20,74,85,15
@@ -394,7 +394,7 @@ BEGIN
     LTEXT           "Name of the instance group where this instance will be inserted. Enter ... to erase all",
                     IDC_STATIC,195,45,160,15
     CONTROL         "Don't add to scene. If checked, this instance will not be added in the scene.",
-                    IDC_DONT_ADD_TO_SCENE,"Button",BS_AUTO3STATE | 
+                    IDC_DONT_ADD_TO_SCENE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,5,71,255,10
     CONTROL         "Don't export the shape. If checked, no shape file will be exported from this object.",
                     IDC_DONT_EXPORT,"Button",BS_AUTO3STATE | WS_TABSTOP,5,86,
@@ -427,15 +427,15 @@ BEGIN
     CONTROL         "Export note track",IDC_EXPORT_NOTE_TRACK,"Button",
                     BS_AUTO3STATE | WS_TABSTOP,5,50,75,10
     CONTROL         "Export animated materials",
-                    IDC_EXPORT_ANIMATED_MATERIALS,"Button",BS_AUTO3STATE | 
+                    IDC_EXPORT_ANIMATED_MATERIALS,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,5,35,98,10
     CONTROL         "Export node animation",IDC_EXPORT_NODE_ANIMATION,"Button",
                     BS_AUTO3STATE | WS_TABSTOP,5,5,98,10
     CONTROL         "Prefixe tracks with node name (Instance name or, if emtpy, node name)",
-                    IDC_EXPORT_ANIMATION_PREFIXE_NAME,"Button",BS_AUTO3STATE | 
+                    IDC_EXPORT_ANIMATION_PREFIXE_NAME,"Button",BS_AUTO3STATE |
                     BS_MULTILINE | WS_TABSTOP,5,20,245,10
     CONTROL         "Allow automatic animation. If the shape is ""obj.shape"", then it will bind ""obj.anim"" automatically.",
-                    IDC_AUTOMATIC_ANIM,"Button",BS_AUTO3STATE | BS_MULTILINE | 
+                    IDC_AUTOMATIC_ANIM,"Button",BS_AUTO3STATE | BS_MULTILINE |
                     WS_TABSTOP,5,65,315,10
     CONTROL         "Export SSS track (Skeleton Spawn Script)",
                     IDC_EXPORT_SSS_TRACK,"Button",BS_AUTO3STATE | WS_TABSTOP,
@@ -449,7 +449,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     IDD_PANEL, DIALOG
     BEGIN
@@ -548,18 +548,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "\r\n"
     "\0"
@@ -575,8 +575,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 2, 0
+ PRODUCTVERSION 0, 11, 2, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -593,14 +593,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.11.0\0"
+            VALUE "FileVersion", "0.11.2\0"
             VALUE "InternalName", "CNelExport\0"
             VALUE "LegalCopyright", "\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "CNelExport.dlu\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.0\0"
+            VALUE "ProductVersion", "0.11.2\0"
             VALUE "SpecialBuild", "\0"
         END
     END
@@ -618,7 +618,7 @@ END
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LIBDESCRIPTION      "Geometry Export/View"
     IDS_CATEGORY            "Nel Tools"
@@ -673,9 +673,9 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,10,5,105,10
     LTEXT           "Frequency Scale :",IDC_STATIC,120,5,60,10
     LTEXT           "Distance Scale :",IDC_STATIC,245,5,60,10
-    EDITTEXT        IDC_EDIT_VPWT_FREQ_SCALE,190,5,35,12,ES_MULTILINE | 
+    EDITTEXT        IDC_EDIT_VPWT_FREQ_SCALE,190,5,35,12,ES_MULTILINE |
                     ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
-    EDITTEXT        IDC_EDIT_VPWT_DIST_SCALE,305,5,35,12,ES_MULTILINE | 
+    EDITTEXT        IDC_EDIT_VPWT_DIST_SCALE,305,5,35,12,ES_MULTILINE |
                     ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
     GROUPBOX        "Level 0 (eg: Tree Trunk)",IDC_STATIC,0,20,355,50
     GROUPBOX        "Level 1 (eg: branch)",IDC_STATIC,0,75,355,55
@@ -790,7 +790,7 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,160,240,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,160,265,50,14
-    LISTBOX         IDC_LMC_COPY_LIST,5,20,120,260,LBS_SORT | 
+    LISTBOX         IDC_LMC_COPY_LIST,5,20,120,260,LBS_SORT |
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "List of objects in LMC mode.",IDC_STATIC,5,10,120,10
     CONTROL         "Custom1",IDC_LMC_COPY_ALWAYS_DIFFUSE,"ColorSwatch",
@@ -829,7 +829,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     IDD_NODE_PROPERTIES_PANEL, DIALOG
     BEGIN
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
index b6eea41a6..97f4c2143 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
@@ -40,7 +40,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_PANEL, DIALOG
     BEGIN
@@ -59,18 +59,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
@@ -85,8 +85,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 2, 0
+ PRODUCTVERSION 0, 11, 2, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -103,12 +103,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "http://www.ryzomcore.org/"
             VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
-            VALUE "FileVersion", "0.11.0"
+            VALUE "FileVersion", "0.11.2"
             VALUE "InternalName", "PatchMesh to RykolPatchMesh"
             VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
             VALUE "OriginalFilename", "nel_convert_patch.dlm"
             VALUE "ProductName", "NeL Patch Converter"
-            VALUE "ProductVersion", "0.11.0"
+            VALUE "ProductVersion", "0.11.2"
         END
     END
     BLOCK "VarFileInfo"
@@ -123,7 +123,7 @@ END
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_LIBDESCRIPTION      "Rykol Patchmesh Converter"
     IDS_CATEGORY            "Rykol Tools"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
index 6de328356..5cc109710 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
@@ -345,12 +345,12 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "modsres.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""windows.h""\r\n"
@@ -359,7 +359,7 @@ BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
@@ -439,7 +439,7 @@ IDB_PATCHSELMASK        BITMAP                  "patselm.bmp"
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_PASTE_NAMEDSET, DIALOG
     BEGIN
@@ -565,7 +565,7 @@ IDI_ICON3               ICON                    "icon3.ico"
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_NORMALMOD        "NormalMod"
     IDS_RB_SKEWMOD          "SkewMod"
@@ -585,7 +585,7 @@ BEGIN
     IDS_RB_VOLSELECT_CLASS  "Vol. Select"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_EDITMESH_CLASS   "Edit Mesh"
     IDS_RB_PARAMETERS       "Parameters"
@@ -594,7 +594,7 @@ BEGIN
     IDS_RB_AMOUNT           "Amount"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_BEND2            "Bend"
     IDS_RB_FROM             "Lower Limit"
@@ -614,7 +614,7 @@ BEGIN
     IDS_RB_DISPLACEMOD      "DisplaceMod"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_NODEXFORM        "Linked XForm"
     IDS_RB_NODEXFORM_CLASS  "Linked XForm"
@@ -630,7 +630,7 @@ BEGIN
     IDS_RB_SOT              "Supports Objects of Type"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_BIASL2           "Bias L2"
     IDS_RB_EDITMESHMOD      "EditMeshMod"
@@ -650,7 +650,7 @@ BEGIN
     IDS_RB_SMOOTHMOD        "SmoothMod"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_EXTRUDE          "Extrude"
     IDS_RB_TAPER            "Taper"
@@ -663,7 +663,7 @@ BEGIN
     IDS_RB_APPARATUS        "Gizmo"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_FREQUENCY        "Frequency"
     IDS_RB_MAPMOD           "MapMod"
@@ -683,7 +683,7 @@ BEGIN
     IDS_RB_BIASL1           "Bias L1"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_AMOUNT2          "Amount"
     IDS_RB_CURVITURE        "Curvature"
@@ -697,13 +697,13 @@ BEGIN
     IDS_DB_EXTRUDE          "Extrude"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_RIPPLE           "Ripple"
     IDS_RB_RIPPLE_BINDING   "Ripple Binding"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_DELETEVERT       "Delete Vertex"
     IDS_RB_DELETEFACE       "Delete Face"
@@ -720,7 +720,7 @@ BEGIN
     IDS_RB_EDGEDIVIDE       "Edge Divide"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_EDGETURN         "Edge Turn"
     IDS_RB_DELETEEDGE       "Delete Edge"
@@ -732,36 +732,36 @@ BEGIN
     IDS_PW_LATTICE          "Lattice Map"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_DEFDEFORMATIONS  "MAX STANDARD"
     IDS_RB_DEFEDIT          "MAX EDIT"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_DEFLECTOR_CLASS  "Deflector"
     IDS_RB_HIDEVERT         "Hide Vertices"
     IDS_RB_DEFSURFACE       "MAX SURFACE"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_NOISE            "Noise"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_ROTATION2        "Rotation"
     IDS_RB_TWIST            "Twist"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_BENDMOD          "BendMod"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_DISPLACEBINDING  "Displace Binding"
     IDS_RB_SELECTDISPIMAGE  "Select Displacement Image"
@@ -781,7 +781,7 @@ BEGIN
     IDS_RB_TURBULENCE       "Turbulence"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_SKEW_CLASS       "Skew"
     IDS_RB_MATERIAL3_CLASS  "Material"
@@ -800,7 +800,7 @@ BEGIN
     IDS_RB_WAVE_CLASS       "Wave"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_STRENGTH2        "Strength"
     IDS_DS_MOVE             "Move"
@@ -809,7 +809,7 @@ BEGIN
     IDS_RB_ELEMENTSEL       "Element"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_NOVERTSTOWELD    "No vertices within weld threshold."
     IDS_RB_CHAOS            "Chaos"
@@ -819,24 +819,24 @@ BEGIN
     IDS_RB_DUPFACEWARNING   "This face already exists."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_NONE             "None"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_SCALE            "Scale"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_DS_MOVE2            "Move"
     IDS_DS_SELECT           "Select"
     IDS_DS_CREATE           "Create"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_VERTDELETE       "Delete Vertex"
     IDS_TH_BEZIERCORNER     "Bezier Corner"
@@ -848,7 +848,7 @@ BEGIN
     IDS_TH_NOPATCHESSEL     "No patches selected"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_EDGESUBDIVIDE    "Edge Subdivide"
     IDS_TH_PATCHSUBDIVIDE   "Patch Subdivide"
@@ -863,16 +863,16 @@ BEGIN
     IDS_TH_CONNECT_COINCIDENT "Weld coincident endpoints?"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_BOOLWELDFAILED   "ERROR: Final boolean weld stage failed"
     IDS_TH_COINCIDENTVERTEX "Cannot perform boolean because splines have coincident vertices"
-    IDS_TH_SPLINESMUSTOVERLAP 
+    IDS_TH_SPLINESMUSTOVERLAP
                             "Cannot perform boolean because splines must overlap"
     IDS_TH_SELECTCLOSEDSPLINE "Please select a closed spline"
     IDS_TH_SPLINESELFINTERSECTS "Spline is invalid: Self-intersects"
     IDS_TH_ATTACH           "Attach"
-    IDS_TH_CANHAVEONLYONESHAPE 
+    IDS_TH_CANHAVEONLYONESHAPE
                             "Can only have one shape in modifier for this operation"
     IDS_TH_NOVERTSSEL       "No vertices selected"
     IDS_TH_VERTCHANGE       "Vertex Change"
@@ -885,7 +885,7 @@ BEGIN
     IDS_TH_LINE             "Line"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_MAKEFIRST        "Make First"
     IDS_TH_EDITEDGE         "Edit Edge"
@@ -896,7 +896,7 @@ BEGIN
     IDS_TH_PATCHADD         "Patch Add"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_EDITSPLINE       "Edit Spline"
     IDS_TH_EDITSEGMENT      "Edit Segment"
@@ -907,7 +907,7 @@ BEGIN
     IDS_TH_EDITOBJECT       "Edit Object"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_DETACHSPLINE     "Detach Spline"
     IDS_TH_OUTLINE          "Outline Spline"
@@ -927,9 +927,9 @@ BEGIN
     IDS_TH_INTERSECTION     "Intersection"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
-    IDS_TH_CANHAVEONLYONEPATCH 
+    IDS_TH_CANHAVEONLYONEPATCH
                             "Can only have one patch object in modifier for this operation"
     IDS_TH_DETACHPATCH      "Detach Patch"
     IDS_TH_COPY_SPLINE      "Copy Spline"
@@ -937,7 +937,7 @@ BEGIN
     IDS_TH_SPLINECHANGE     "Spline Change"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_EDITPATCH_CLASS  "NeL Edit"
     IDS_TH_EDITSPLINE_CLASS "Edit Spline"
@@ -957,7 +957,7 @@ BEGIN
     IDS_TH_NOSEGSSEL        "No segments selected"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_DEGREES          "Degrees"
     IDS_TH_AXIS             "Axis"
@@ -968,12 +968,12 @@ BEGIN
     IDS_RB_STARTPOINT       "Start Point"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_MIRRORSPLINE     "Mirror Spline"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_ENDPOINT         "End Point"
     IDS_RB_AFRPOINTS        "Points"
@@ -993,7 +993,7 @@ BEGIN
     IDS_RB_VOFFSET          "V Offset"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_WOFFSET          "W Offset"
     IDS_RB_MAXEDGE1         "Max Edge Length 1"
@@ -1013,14 +1013,14 @@ BEGIN
     IDS_RB_SHOULDRESET      "Do you also want to reset the Unwrap UVW modifier\nto inherit the mapping from the new channel?\n\nChanges made within the UVW modifier will be lost."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_NUMVERTSELP      "%d Vertices Selected"
     IDS_RB_NUMFACESELP      "%d Faces Selected"
     IDS_RB_NUMEDGESELP      "%d Edges Selected"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_RESETUNWRAPUVWS  "Are you sure you want to reset?\n\nAll changes made within the  Unwrap UVW modifier will be lost."
     IDS_RB_LENGTH           "Length"
@@ -1040,7 +1040,7 @@ BEGIN
     IDS_RB_ZOOMREG          "Zoom Region"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RB_UVW              "Coordinates"
     IDS_RB_PROP             "Unwrap Options"
@@ -1060,10 +1060,10 @@ BEGIN
     IDS_EM_SHAPE            "Shape"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_ADV_SURF_APPROX_WARNING_TITLE "Surface Approximation Verification"
-    IDS_ADV_SURF_APPROX_WARNING 
+    IDS_ADV_SURF_APPROX_WARNING
                             "You have selected a potentially dangerous setting for the SubDivision limits.  Are you sure you want to do this?"
     IDS_PW_PICK             "Pick Texture"
     IDS_PW_SNAP             "Pixel Snap"
@@ -1079,7 +1079,7 @@ BEGIN
     IDS_PW_FALLOFF          "Falloff type"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_EM_SELBYCOLOR       "Select By Color"
     IDS_EM_VERTEXCOLOR      "Vertex Color"
@@ -1099,7 +1099,7 @@ BEGIN
     IDS_EM_DETACHFACES      "Detach Faces"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_EM_DETACHVERTS      "Detach Verts"
     IDS_EM_INHERIT_MATERIAL "Inherit Material"
@@ -1119,7 +1119,7 @@ BEGIN
     IDS_TH_SPLINE_VERT_COUNT "Vertex Count: %d"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_SELECTION        "Selection"
     IDS_TH_OBJECT_SEL       "Whole Object Selected"
@@ -1139,17 +1139,17 @@ BEGIN
     IDS_TH_CROSS_INSERT     "Cross Insert"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_EM_BEVEL            "Bevel"
     IDS_EM_OUTLINE          "Outline"
-    IDS_ADV_DISP_APPROX_WARNING_TITLE 
+    IDS_ADV_DISP_APPROX_WARNING_TITLE
                             "Displacement Approximation Verification"
-    IDS_ADV_DISP_APPROX_WARNING 
+    IDS_ADV_DISP_APPROX_WARNING
                             "You have selected a potential dangerous setting for the SubDivision limits.  Are you sure you want to do this?"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PW_FALLOFFSPACE     "World Falloff Space"
     IDS_PW_BREAK            "Break Selected Vertices"
@@ -1169,7 +1169,7 @@ BEGIN
     IDS_PW_TEXMAP           "TextureMap"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PW_CHANNEL          "Map Channel"
     IDS_PW_MAP              "Map Channel Type"
@@ -1181,9 +1181,9 @@ BEGIN
     IDS_PW_FALLOFF2         "Falloff"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
-    IDS_TH_CROSS_NOT_IN_THRESHOLD 
+    IDS_TH_CROSS_NOT_IN_THRESHOLD
                             "Crossing lines not within specified threshold"
     IDS_TH_EDGEDELETE       "Delete Edge"
     IDS_TH_NOEDGESSEL       "No edges selected"
@@ -1200,7 +1200,7 @@ BEGIN
     IDS_TH_OPEN             "Open"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TH_CLOSED           "Closed"
     IDS_EM_ATTACH_LIST      "Attach List"
@@ -1220,7 +1220,7 @@ BEGIN
     IDS_PW_SCALEV           "Scale Vertical"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PW_WELDSELECTED     "Weld Selected"
     IDS_PW_APPLYPLANAR      "Apply Planar"
@@ -1240,7 +1240,7 @@ BEGIN
     IDS_PW_UNHIDEALL        "Unhide All"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PW_FREEZE_SELECTED  "Freeze Selected"
     IDS_PW_UNFREEZEALL      "Unfreeze All"
@@ -1249,7 +1249,7 @@ BEGIN
     IDS_PW_SCALE_UVW        "Scale UVWs"
     IDS_PW_WELD_UVW         "Weld UVWs"
     IDS_PW_LINECOLOR        "Line Color"
-    IDS_RB_UNSUPPORTED_MAP_TYPE 
+    IDS_RB_UNSUPPORTED_MAP_TYPE
                             "The Displace modifier does not support the mapping type that has been selected to acquire."
     IDS_MM_ACQ_MAPPING      "Aquire Mapping"
     IDS_PARAM_CHANGE        "Parameter Change"
@@ -1261,7 +1261,7 @@ BEGIN
     IDS_PW_MOUSE_CONSTRAIN  "SHIFT constrains the mouse to X/Y"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PW_MOUSE_SELECTTV   "Select texture vertices"
     IDS_PW_MOUSE_SELECTTRI  "SHIFT selects triangle faces"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
index 507d36ab5..62e7fa34f 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
@@ -34,7 +34,7 @@ STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "Paint",IDC_PAINT,"CustButton",WS_TABSTOP,7,5,38,19
-    CONTROL         "Meshes",IDC_INCLUDE_MESHES,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Meshes",IDC_INCLUDE_MESHES,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,50,5,45,10
     CONTROL         "Preload Tiles",IDC_PRELOAD_TILES,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,50,15,50,10
@@ -47,12 +47,12 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "modsres.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""windows.h""\r\n"
@@ -61,7 +61,7 @@ BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "\r\n"
     "\0"
@@ -76,7 +76,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     IDD_EDPATCH_OPS, DIALOG
     BEGIN
@@ -96,8 +96,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 1, 0
- PRODUCTVERSION 0, 11, 1, 0
+ FILEVERSION 0, 11, 2, 0
+ PRODUCTVERSION 0, 11, 2, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -116,14 +116,14 @@ BEGIN
             VALUE "Comments", "TECH: cyril.corvazier\0"
             VALUE "CompanyName", "Ryzom Core\0"
             VALUE "FileDescription", "NeL Patch Paint\0"
-            VALUE "FileVersion", "0.11.1\0"
+            VALUE "FileVersion", "0.11.2\0"
             VALUE "InternalName", "mods\0"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.1\0"
+            VALUE "ProductVersion", "0.11.2\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
index 4e70d1afc..4fce83b64 100644
--- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
@@ -72,7 +72,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     IDD_PANEL, DIALOG
     BEGIN
@@ -90,18 +90,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "\r\n"
     "\0"
@@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR      CURSOR  DISCARDABLE     "dropcurs.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 2, 0
+ PRODUCTVERSION 0, 11, 2, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -145,13 +145,13 @@ BEGIN
             VALUE "Comments", "TECH: \0"
             VALUE "CompanyName", "Ryzom Core\0"
             VALUE "FileDescription", "Vertex Tree Paint\0"
-            VALUE "FileVersion", "0.11.0\0"
+            VALUE "FileVersion", "0.11.2\0"
             VALUE "InternalName", "VertexTreePaint\0"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0"
             VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0"
             VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.0\0"
+            VALUE "ProductVersion", "0.11.2\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -179,11 +179,11 @@ IDB_BUTTON_MASK         BITMAP  DISCARDABLE     "buttonmask.bmp"
 IDD_PANEL DLGINIT
 BEGIN
     IDC_COMBO_TYPE, 0x403, 10, 0
-0x6e49, 0x6574, 0x736e, 0x7469, 0x0079, 
+0x6e49, 0x6574, 0x736e, 0x7469, 0x0079,
     IDC_COMBO_TYPE, 0x403, 14, 0
-0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0031, 
+0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0031,
     IDC_COMBO_TYPE, 0x403, 14, 0
-0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0032, 
+0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0032,
     0
 END
 
@@ -193,7 +193,7 @@ END
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LIBDESCRIPTION      "Vertex tree painting modifier (Kinetix/Nel)"
     IDS_CATEGORY            "NeL Tools"
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
index 80d1d390d..003d1639c 100644
--- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
+++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
@@ -31,7 +31,7 @@ STYLE WS_CHILD | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
     PUSHBUTTON      "Button1",IDC_BANK_PATH,5,5,95,14
-    COMBOBOX        IDC_LAND,5,25,95,75,CBS_DROPDOWNLIST | CBS_SORT | 
+    COMBOBOX        IDC_LAND,5,25,95,75,CBS_DROPDOWNLIST | CBS_SORT |
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Setup material",IDC_SETUP,20,80,70,15,WS_DISABLED
     LTEXT           "Static",IDC_TILE_COUNT1,10,45,85,8
@@ -56,9 +56,9 @@ BEGIN
     CONTROL         "",IDC_MAPON2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,
                     38,8,10
     GROUPBOX        "Alpha From:",IDC_STATIC,23,66,89,57
-    CONTROL         "Map #1",IDC_MULT_ALPHA1,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "Map #1",IDC_MULT_ALPHA1,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP | WS_TABSTOP,36,77,41,10
-    CONTROL         "Map #2",IDC_MULT_ALPHA2,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "Map #2",IDC_MULT_ALPHA2,"Button",BS_AUTORADIOBUTTON |
                     WS_TABSTOP,36,91,41,10
     CONTROL         "Multiply Alphas",IDC_MULT_ALPHA3,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,36,106,63,10
@@ -73,7 +73,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     IDD_PANEL, DIALOG
     BEGIN
@@ -97,18 +97,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "\r\n"
     "\0"
@@ -124,8 +124,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 2, 0
+ PRODUCTVERSION 0, 11, 2, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -142,12 +142,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.11.0\0"
+            VALUE "FileVersion", "0.11.2\0"
             VALUE "InternalName", "Tile_utility\0"
             VALUE "LegalCopyright", "\0"
             VALUE "OriginalFilename", "Tile_utility.dlu\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.0\0"
+            VALUE "ProductVersion", "0.11.2\0"
             VALUE "FileDescription", "Create material for tiles\0"
             VALUE "Comments", "TECH: \0"
             VALUE "LegalTrademarks", "\0"
@@ -167,7 +167,7 @@ END
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LIBDESCRIPTION      "Create material for tiles"
     IDS_CATEGORY            "Rykol Tools"
@@ -177,7 +177,7 @@ BEGIN
     IDS_COLOR1              "Color 1"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_PHASE            "Phase"
     IDS_DS_AMBIENT          "Ambient Color"
@@ -185,7 +185,7 @@ BEGIN
     IDS_DS_SPECULAR         "Specular Color"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_WIREFRAME        "Wire"
     IDS_DS_SHININESS        "Glossiness"
@@ -203,7 +203,7 @@ BEGIN
     IDS_GRAD_TYPE           "Gradient Type"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_JW_MAPENABLES       "Map Enables"
     IDS_DS_THRESH           "Position"
@@ -223,7 +223,7 @@ BEGIN
     IDS_DS_ANGLE            "Angle"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_COLOR1           "Color 1"
     IDS_DS_COLOR2           "Color 2"
@@ -243,7 +243,7 @@ BEGIN
     IDS_DS_MIXAMT           "Mix Amount"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_SHRINK_ENV       "Shrink-wrap Environment"
     IDS_DS_SCREEN           "Screen"
@@ -263,7 +263,7 @@ BEGIN
     IDS_JW_MAPS             "Maps"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_JW_MAPAMOUNTS       "Map Amounts"
     IDS_DS_MATTE_SHADOW_PAR "Matte/Shadow Basic Parameters"
@@ -280,7 +280,7 @@ BEGIN
     IDS_JW_SAMPLERBYNAME    "Sampler Name"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_NOISEPARMS       "Noise Parameters"
     IDS_DS_MIXPARMS         "Mix Parameters"
@@ -300,7 +300,7 @@ BEGIN
     IDS_DS_CYL_ENV          "Cylindrical Environment"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_XLABEL           "X:"
     IDS_DS_YLABEL           "Y:"
@@ -311,7 +311,7 @@ BEGIN
     IDS_DS_BITMAP_TEXTURE_ERR "Bitmap Texture Error"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_RB_NOISE            "Noise"
     IDS_RB_MULTISUBOBJECT   "Multi/Sub-Object"
@@ -320,7 +320,7 @@ BEGIN
     IDS_RB_BACK             "Back"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_RB_FACING           "Facing"
     IDS_RB_MASK             "Mask"
@@ -340,7 +340,7 @@ BEGIN
     IDS_RB_CENTER2          "Color 2 Position"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_RB_HIGHTHRESHOLD    "High Threshold"
     IDS_RB_LOWTHRESHOLD     "Low Threshold"
@@ -360,12 +360,12 @@ BEGIN
     IDS_DS_BOTTOM           "Bottom"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_RB_AMOUNT           "Amount"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_RB_CURVITURE        "Curvature"
     IDS_RB_AMPLITUDE        "Amplitude"
@@ -374,13 +374,13 @@ BEGIN
     IDS_RB_DECAY            "Decay"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_RB_LOWTHRESH        "Low Threshold"
     IDS_RB_HIGHTHRESH       "High Threshold"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_MARBLE           "Marble"
     IDS_DS_MIX              "Mix"
@@ -400,7 +400,7 @@ BEGIN
     IDS_DS_CHECKER          "Checker"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_NONE             "None"
     IDS_DS_TRANS            "Opacity"
@@ -420,12 +420,12 @@ BEGIN
     IDS_DS_CLIPV            "Clip V Offset"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_PARAMCHG         "Param Change"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_CLIPW            "Clip U Width"
     IDS_DS_CLIPH            "Clip V Width"
@@ -445,7 +445,7 @@ BEGIN
     IDS_DS_FALLOFF          "Falloff"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_FALLOFFPARAMS    "Falloff Parameters"
     IDS_DS_PERVAL           "Perpendicular Value:"
@@ -465,7 +465,7 @@ BEGIN
     IDS_DS_PLATE_PARAMS     "Thin Wall Refraction Parameters"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_THICKFACT        "Thickness Offset"
     IDS_DS_REFRAMT          "Bump Map Effect"
@@ -485,7 +485,7 @@ BEGIN
     IDS_DS_GREEN            "Green"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_BLUE             "Blue"
     IDS_DS_SOFTEN           "Soften Level"
@@ -505,7 +505,7 @@ BEGIN
     IDS_KE_OREN_NAYAR_BLINN "Oren-Nayar-Blinn"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_KE_DIFF_LEVEL       "Diffuse Level"
     IDS_KE_DIFF_ROUGH       "Diff. Roughness"
@@ -525,7 +525,7 @@ BEGIN
     IDS_KE_COLOR            "Color"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_KE_ANISOTROPY       "Anisotropy"
     IDS_KE_ORIENTATION      "Orientation"
@@ -545,7 +545,7 @@ BEGIN
     IDS_KE_GLOSS1           "Glossiness 1"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_KE_GLOSS2           "Glossiness 2"
     IDS_KE_ANISO1           "Anisotropy 1"
@@ -565,7 +565,7 @@ BEGIN
     IDS_JW_APPLYREFDIM      "Apply Reflection Dimming"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_JW_PIXELSAMPLER     "Pixel Sampler"
     IDS_JW_SAMPLERQUAL      "Sampler Quality"
@@ -585,7 +585,7 @@ BEGIN
     IDS_RB_BLENDMAT_CDESC   "Blend"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DS_MIX_CDESC        "Mix"
     IDS_DS_FLATMIRROR_CDESC "Flat Mirror"
@@ -602,7 +602,7 @@ BEGIN
     IDS_JW_ADTEXLOCK        "Ambient-Diffuse Texture Lock"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_JW_ADLOCK           "Ambient-Diffuse Lock"
     IDS_JW_DSLOCK           "Diffuse-Specular Lock"
@@ -621,7 +621,7 @@ BEGIN
     IDS_PW_APPLYATMOS       "ApplyAtmosphere"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PW_ATMOSDEPTH       "AtmossphereDepth"
     IDS_PW_RECEIVESHADOWS   "RecieveShadows"
@@ -641,7 +641,7 @@ BEGIN
     IDS_PW_STARTTIME        "StartTime"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PW_PLAYBACK         "PlayBackRate"
     IDS_PW_ENDCONDITION     "EndCondition"
@@ -661,7 +661,7 @@ BEGIN
     IDS_PW_APPLYBLUR        "ApplyBlur"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_KE_FACETED          "Faceted"
     IDS_KE_ORIENTATION1     "Orientation 1"
@@ -680,7 +680,7 @@ BEGIN
     IDS_PW_MAT              "Mat."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PW_BASE             "Base"
     IDS_DS_USEREFL          "UseReflMap"
@@ -695,7 +695,7 @@ BEGIN
     IDS_ACUBIC_SELECT_INPUT_FILE "Select Input Reflection Map"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     65505                   "RGB Level"
     65506                   "RGB Offset"
diff --git a/code/web/public_php/ams/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl
index 33dbf3be0..fb29b4468 100644
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@@ -140,7 +140,7 @@
 						{if isset($smarty.get.page) and $smarty.get.page eq 'layout_plugin' and $smarty.get.name eq $arrkey}
 							{include file=$hook_info[$smarty.get.name]['TemplatePath']}
 						{/if}
-					{/foreach}	
+					{/foreach}
 				</div>
 			{/if}
 
@@ -167,7 +167,7 @@
 		</div>
 
 		<footer>
-			{if $permission > 1}<p class="pull-right">AMS 0.11.0 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
+			{if $permission > 1}<p class="pull-right">AMS 0.11.2 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
 		</footer>
 		{/if}
 	</div><!--/.fluid-container-->

From 74fea9e478c5332f54c4d1120679547f3fa97217 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 6 Mar 2015 23:38:37 +0100
Subject: [PATCH 3/6] Add script to increment version numbers

---
 .../increment_version/increment_version.py    | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 code/tool/increment_version/increment_version.py

diff --git a/code/tool/increment_version/increment_version.py b/code/tool/increment_version/increment_version.py
new file mode 100644
index 000000000..0be81269f
--- /dev/null
+++ b/code/tool/increment_version/increment_version.py
@@ -0,0 +1,162 @@
+#
+# Copyright (c) 2015  Jan Boon <jan.boon@kaetemi.be>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+import fileinput
+import os
+
+os.chdir('../../')
+RootDir = os.getcwd();
+
+MajorVersion = 0
+MinorVersion = 11
+PatchVersion = 2
+Revision = 0
+
+VersionString = str(MajorVersion) + "." + str(MinorVersion) + "." + str(PatchVersion)
+VersionComma = str(MajorVersion) + ", " + str(MinorVersion) + ", " + str(PatchVersion) + ", " + str(Revision)
+
+for line in fileinput.input("CMakeLists.txt", inplace = True):
+	if ("#  Version" in line):
+		print "#  Version: " + VersionString
+	elif ("SET(NL_VERSION_MAJOR" in line):
+		print "SET(NL_VERSION_MAJOR " + str(MajorVersion) + ")"
+	elif ("SET(NL_VERSION_MINOR" in line):
+		print "SET(NL_VERSION_MINOR " + str(MinorVersion) + ")"
+	elif ("SET(NL_VERSION_PATCH" in line):
+		print "SET(NL_VERSION_PATCH " + str(PatchVersion) + ")"
+	else:
+		print line.rstrip()
+
+os.chdir(RootDir)
+os.chdir("web/public_php/ams/templates/")
+
+for line in fileinput.input("layout.tpl", inplace = True):
+	if (" Powered by: " in line):
+		print "\t\t\t{if $permission > 1}<p class=\"pull-right\">AMS " + VersionString + " Powered by: <a href=\"http://usman.it/free-responsive-admin-template\">Charisma</a></p>{/if}"
+	else:
+		print line.rstrip()
+
+os.chdir(RootDir)
+os.chdir("ryzom/common/src/game_share/")
+
+for line in fileinput.input("ryzom_version.h", inplace = True):
+	if (("\"v" in line) and (" \\" in line)):
+		print "\t\"v" + VersionString + "\" \\"
+	else:
+		print line.rstrip()
+
+os.chdir(RootDir)
+os.chdir("nel/tools/3d/plugin_max/")
+os.chdir("nel_export")
+
+for line in fileinput.input("nel_export.rc", inplace = True):
+	if ("FILEVERSION" in line):
+		print " FILEVERSION " + VersionComma
+	elif ("PRODUCTVERSION" in line):
+		print " PRODUCTVERSION " + VersionComma
+	elif (("FileVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+	elif (("ProductVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+	else:
+		print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_patch_converter")
+
+for line in fileinput.input("nel_patch_converter.rc", inplace = True):
+	if ("FILEVERSION" in line):
+		print " FILEVERSION " + VersionComma
+	elif ("PRODUCTVERSION" in line):
+		print " PRODUCTVERSION " + VersionComma
+	elif (("FileVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"FileVersion\", \"" + VersionString + "\""
+	elif (("ProductVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"ProductVersion\", \"" + VersionString + "\""
+	else:
+		print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_patch_edit")
+
+for line in fileinput.input("mods.rc", inplace = True):
+	if ("FILEVERSION" in line):
+		print " FILEVERSION " + VersionComma
+	elif ("PRODUCTVERSION" in line):
+		print " PRODUCTVERSION " + VersionComma
+	elif (("FileVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"FileVersion\", \"" + VersionString + "\""
+	elif (("ProductVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"ProductVersion\", \"" + VersionString + "\""
+	else:
+		print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_patch_paint")
+
+for line in fileinput.input("nel_patch_paint.rc", inplace = True):
+	if ("FILEVERSION" in line):
+		print " FILEVERSION " + VersionComma
+	elif ("PRODUCTVERSION" in line):
+		print " PRODUCTVERSION " + VersionComma
+	elif (("FileVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+	elif (("ProductVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+	else:
+		print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_vertex_tree_paint")
+
+for line in fileinput.input("vertex_tree_paint.rc", inplace = True):
+	if ("FILEVERSION" in line):
+		print " FILEVERSION " + VersionComma
+	elif ("PRODUCTVERSION" in line):
+		print " PRODUCTVERSION " + VersionComma
+	elif (("FileVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+	elif (("ProductVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+	else:
+		print line.rstrip()
+
+os.chdir("..")
+os.chdir("tile_utility")
+
+for line in fileinput.input("tile_utility.rc", inplace = True):
+	if ("FILEVERSION" in line):
+		print " FILEVERSION " + VersionComma
+	elif ("PRODUCTVERSION" in line):
+		print " PRODUCTVERSION " + VersionComma
+	elif (("FileVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+	elif (("ProductVersion" in line) and ("VALUE" in line)):
+		print "            VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+	else:
+		print line.rstrip()
+
+# end of file

From 22808eebc597b2cdc056c84193b86c175c5b2329 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 6 Mar 2015 23:53:34 +0100
Subject: [PATCH 4/6] ryzomcore/v0.11.3

---
 code/CMakeLists.txt                                       | 4 ++--
 code/nel/tools/3d/plugin_max/nel_export/nel_export.rc     | 8 ++++----
 .../plugin_max/nel_patch_converter/nel_patch_converter.rc | 8 ++++----
 code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc       | 8 ++++----
 .../3d/plugin_max/nel_patch_paint/nel_patch_paint.rc      | 8 ++++----
 .../plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc | 8 ++++----
 code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc | 8 ++++----
 code/ryzom/common/src/game_share/ryzom_version.h          | 2 +-
 code/tool/increment_version/increment_version.py          | 2 +-
 code/web/public_php/ams/templates/layout.tpl              | 2 +-
 10 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index dcc9f9c93..7a4f0b4c5 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Ryzom Core
 #  Authors: Nevrax and the Ryzom Core Community
-#  Version: 0.11.2
+#  Version: 0.11.3
 #
 # Notes:
 #   * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path
@@ -48,7 +48,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 0)
 SET(NL_VERSION_MINOR 11)
-SET(NL_VERSION_PATCH 2)
+SET(NL_VERSION_PATCH 3)
 SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
 
 #-----------------------------------------------------------------------------
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
index b5eaa964d..31a258fb9 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
@@ -575,8 +575,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -593,14 +593,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
             VALUE "InternalName", "CNelExport\0"
             VALUE "LegalCopyright", "\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "CNelExport.dlu\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
index 97f4c2143..068bddea0 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
@@ -85,8 +85,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -103,12 +103,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "http://www.ryzomcore.org/"
             VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
-            VALUE "FileVersion", "0.11.2"
+            VALUE "FileVersion", "0.11.3"
             VALUE "InternalName", "PatchMesh to RykolPatchMesh"
             VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
             VALUE "OriginalFilename", "nel_convert_patch.dlm"
             VALUE "ProductName", "NeL Patch Converter"
-            VALUE "ProductVersion", "0.11.2"
+            VALUE "ProductVersion", "0.11.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
index 5cc109710..d49d40a82 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
@@ -514,8 +514,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -533,13 +533,13 @@ BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core"
             VALUE "FileDescription", "NeL Patch Edit"
-            VALUE "FileVersion", "0.11.2"
+            VALUE "FileVersion", "0.11.3"
             VALUE "InternalName", "neleditpatch"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc."
             VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF."
             VALUE "OriginalFilename", "neleditpatch.dlm"
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", "0.11.2"
+            VALUE "ProductVersion", "0.11.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
index 62e7fa34f..6b8d7f88e 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
@@ -96,8 +96,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -116,14 +116,14 @@ BEGIN
             VALUE "Comments", "TECH: cyril.corvazier\0"
             VALUE "CompanyName", "Ryzom Core\0"
             VALUE "FileDescription", "NeL Patch Paint\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
             VALUE "InternalName", "mods\0"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
index 4fce83b64..8620d6170 100644
--- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
@@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR      CURSOR  DISCARDABLE     "dropcurs.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -145,13 +145,13 @@ BEGIN
             VALUE "Comments", "TECH: \0"
             VALUE "CompanyName", "Ryzom Core\0"
             VALUE "FileDescription", "Vertex Tree Paint\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
             VALUE "InternalName", "VertexTreePaint\0"
             VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0"
             VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0"
             VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
index 003d1639c..315747354 100644
--- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
+++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
@@ -124,8 +124,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -142,12 +142,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
             VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
             VALUE "InternalName", "Tile_utility\0"
             VALUE "LegalCopyright", "\0"
             VALUE "OriginalFilename", "Tile_utility.dlu\0"
             VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
             VALUE "FileDescription", "Create material for tiles\0"
             VALUE "Comments", "TECH: \0"
             VALUE "LegalTrademarks", "\0"
diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h
index 915f9ed1c..9b4fa3f07 100644
--- a/code/ryzom/common/src/game_share/ryzom_version.h
+++ b/code/ryzom/common/src/game_share/ryzom_version.h
@@ -19,7 +19,7 @@
 
 #define RYZOM_VERSION	"ryzomcore" \
 	"/" \
-	"v0.11.2" \
+	"v0.11.3" \
 	""
 
 #endif // RYZOM_VERSION_H
diff --git a/code/tool/increment_version/increment_version.py b/code/tool/increment_version/increment_version.py
index 0be81269f..43afec9ee 100644
--- a/code/tool/increment_version/increment_version.py
+++ b/code/tool/increment_version/increment_version.py
@@ -32,7 +32,7 @@ RootDir = os.getcwd();
 
 MajorVersion = 0
 MinorVersion = 11
-PatchVersion = 2
+PatchVersion = 3
 Revision = 0
 
 VersionString = str(MajorVersion) + "." + str(MinorVersion) + "." + str(PatchVersion)
diff --git a/code/web/public_php/ams/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl
index fb29b4468..94cf0b4dd 100644
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@@ -167,7 +167,7 @@
 		</div>
 
 		<footer>
-			{if $permission > 1}<p class="pull-right">AMS 0.11.2 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
+			{if $permission > 1}<p class="pull-right">AMS 0.11.3 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
 		</footer>
 		{/if}
 	</div><!--/.fluid-container-->

From d37ca69db54a1446f801f46dec71e0cd2960548f Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 6 Mar 2015 23:56:49 +0100
Subject: [PATCH 5/6] EOL

---
 .../ams_lib/ingame_templates/settings.tpl     | 322 ++++----
 .../ams/ingame_templates/register.tpl         | 236 +++---
 .../ams/ingame_templates/settings.tpl         | 494 +++++------
 .../admin/templates/default/index_login.tpl   |  50 +-
 .../admin/templates/default/tool_actions.tpl  |  12 +-
 .../tool_administration_applications.tpl      | 230 +++---
 .../default/tool_administration_domains.tpl   | 370 ++++-----
 .../default/tool_administration_groups.tpl    | 668 +++++++--------
 .../default/tool_administration_logs.tpl      | 112 +--
 .../default/tool_administration_restarts.tpl  | 344 ++++----
 .../default/tool_administration_shards.tpl    | 220 ++---
 .../default/tool_administration_users.tpl     | 414 +++++-----
 .../admin/templates/default/tool_graphs.tpl   | 548 ++++++-------
 .../templates/default/tool_graphs_ccu.tpl     | 460 +++++------
 .../templates/default/tool_graphs_hires.tpl   | 504 ++++++------
 .../templates/default/tool_graphs_tech.tpl    | 500 ++++++------
 .../admin/templates/default/tool_notes.tpl    | 328 ++++----
 .../ams/templates/forgot_password.tpl         | 108 +--
 .../web/public_php/ams/templates/register.tpl | 248 +++---
 .../ams/templates/reset_password.tpl          | 132 +--
 .../web/public_php/ams/templates/settings.tpl | 764 +++++++++---------
 21 files changed, 3532 insertions(+), 3532 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
index 4e94e633c..50d47d680 100644
--- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
@@ -1,161 +1,161 @@
-{block name=content}
-<tr><td>
-      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr bgcolor="{$second_menu_bg_color}" valign="middle">
-	  <td>
-	  <table>
-	    <tr>
-	      <td>
-		<table cellspacing="0" cellpadding="4">
-		  <tr>		    
-		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=show_user&id={$target_id}"><h7>Browse User</h7></a></td>
-		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=createticket&user_id={$target_id}"><h7>Send Ticket</h7></a></td>
-		    {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1}
-			{if $userPermission eq 1}
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Make Moderator</h7></a></td>
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
-			{else if $userPermission eq 2 }
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
-			{else if $userPermission eq 3 }
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Demote to Moderator</h7></a></td>
-			{/if}
-		    {/if}
-		  </tr>
-		</table>
-	      </td>
-	    </tr>
-	  </table>
-	  </td>
-	</tr>
-	<tr>
-		<td height="3" bgcolor="#000000"></td>
-	</tr>
-      </table>
-  </td></tr>
-
-    <tr><td>
-	<table width="100%" bgcolor="{$title_bg_color}" cellspacing="2">
-	<tr><td height="7"></td><td></td></tr>
-	<tr>
-		<td width="3%"></td>
-		<td width="100%" height="12" valign="middle"><h1>Change Settings of {$target_username}</h1></td>
-	</tr>
-	<tr>
-	  <td height="5"></td><td></td>
-	</tr>
-	</table>
-  </td></tr>
-  <tr><td>
-      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr bgcolor="#000000" valign="middle">
-	  <td>
-	    <table>
-	      <tr><td height="8"></td></tr>
-	    </table>
-	  </td>
-	</tr>
-	<tr><td height="2"></td></tr>
-	<tr><td height="1" bgcolor="#000000"></td></tr>
-	<tr><td height="10"></td></tr>
-	<tr valign="middle">
-	  <td>
-	    <table width="100%" height="100%" cellpadding="10">
-	      <tr><td>
-		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
-			<tr><td>
-				<table cellpadding="10">
-					<tr><td>
-						
-					<p><h3>Change Password</h3></p>
-					
-					<form id="changePassword" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
-						<table cellpadding="1">
-						{if !isset($changesOther) or $changesOther eq "FALSE"}
-						<tr>
-							<td valign="middle">
-							Current Password:
-							</td>
-							<td>
-							<input type="text" id="CurrentPass" name="CurrentPass" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
-							{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<font color="red">The password is incorrect</font>{/if}
-							</td>
-							</p>
-						</tr>
-						{/if}
-						<tr><td valign="middle">
-						New Password:
-						</td><td>
-						<input type="text" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
-						{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$newpass_error_message}</font>{/if}
-						</td></tr>
-							
-						<tr><td valign="middle">
-						Confirm New Password:
-						</td><td>
-						<input type="text" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
-						{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$confirmnewpass_error_message}</font>{/if}
-						</td></tr>  
-						</table>
-						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-						<p><font color="green">
-							The password has been changed!
-						</font></p>
-						{/if}
-						
-						
-						<input type="hidden" name="function" value="change_password">
-						<input type="hidden" name="target_id" value="{$target_id}">
-
-						<p><input type="submit" value="Change Password"/></p>
-
-					</form>		
-								
-					</td></tr>
-				</table>
-			</td></tr>
-		</table>
-	      </td></tr>
-	      <tr><td>
-		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
-			<tr><td>
-				<table cellpadding="10">
-					<tr><td>
-						<p><h3>Change Email</h3></p>
-						
-						<form id="changeEmail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
-						<table>
-							<tr><td valign="middle">
-							New Email:
-							</td><td>
-							<input type="text" class="input-xlarge" id="NewEmail" size="200" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
-							{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<font color="red">{$EMAIL}</font>{/if}
-							</td></tr>
-						</table>
-						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
-						<p>
-							<font color="green">The email has been changed!</green>
-						</p>
-						{/if}
-						
-						<input type="hidden" name="function" value="change_mail">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<p>
-						<input type="submit" value="Change Email"/>
-						</p>
-					</form>
-					</td></tr>
-				</table>
-			</td></tr>
-		</table>
-	      </td></tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-      
-  </td></tr>
-	
-{/block}
-	
+{block name=content}
+<tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="{$second_menu_bg_color}" valign="middle">
+	  <td>
+	  <table>
+	    <tr>
+	      <td>
+		<table cellspacing="0" cellpadding="4">
+		  <tr>		    
+		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=show_user&id={$target_id}"><h7>Browse User</h7></a></td>
+		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=createticket&user_id={$target_id}"><h7>Send Ticket</h7></a></td>
+		    {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1}
+			{if $userPermission eq 1}
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Make Moderator</h7></a></td>
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
+			{else if $userPermission eq 2 }
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
+			{else if $userPermission eq 3 }
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Demote to Moderator</h7></a></td>
+			{/if}
+		    {/if}
+		  </tr>
+		</table>
+	      </td>
+	    </tr>
+	  </table>
+	  </td>
+	</tr>
+	<tr>
+		<td height="3" bgcolor="#000000"></td>
+	</tr>
+      </table>
+  </td></tr>
+
+    <tr><td>
+	<table width="100%" bgcolor="{$title_bg_color}" cellspacing="2">
+	<tr><td height="7"></td><td></td></tr>
+	<tr>
+		<td width="3%"></td>
+		<td width="100%" height="12" valign="middle"><h1>Change Settings of {$target_username}</h1></td>
+	</tr>
+	<tr>
+	  <td height="5"></td><td></td>
+	</tr>
+	</table>
+  </td></tr>
+  <tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="#000000" valign="middle">
+	  <td>
+	    <table>
+	      <tr><td height="8"></td></tr>
+	    </table>
+	  </td>
+	</tr>
+	<tr><td height="2"></td></tr>
+	<tr><td height="1" bgcolor="#000000"></td></tr>
+	<tr><td height="10"></td></tr>
+	<tr valign="middle">
+	  <td>
+	    <table width="100%" height="100%" cellpadding="10">
+	      <tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						
+					<p><h3>Change Password</h3></p>
+					
+					<form id="changePassword" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
+						<table cellpadding="1">
+						{if !isset($changesOther) or $changesOther eq "FALSE"}
+						<tr>
+							<td valign="middle">
+							Current Password:
+							</td>
+							<td>
+							<input type="text" id="CurrentPass" name="CurrentPass" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
+							{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<font color="red">The password is incorrect</font>{/if}
+							</td>
+							</p>
+						</tr>
+						{/if}
+						<tr><td valign="middle">
+						New Password:
+						</td><td>
+						<input type="text" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
+						{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$newpass_error_message}</font>{/if}
+						</td></tr>
+							
+						<tr><td valign="middle">
+						Confirm New Password:
+						</td><td>
+						<input type="text" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
+						{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$confirmnewpass_error_message}</font>{/if}
+						</td></tr>  
+						</table>
+						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
+						<p><font color="green">
+							The password has been changed!
+						</font></p>
+						{/if}
+						
+						
+						<input type="hidden" name="function" value="change_password">
+						<input type="hidden" name="target_id" value="{$target_id}">
+
+						<p><input type="submit" value="Change Password"/></p>
+
+					</form>		
+								
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+	      <tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						<p><h3>Change Email</h3></p>
+						
+						<form id="changeEmail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
+						<table>
+							<tr><td valign="middle">
+							New Email:
+							</td><td>
+							<input type="text" class="input-xlarge" id="NewEmail" size="200" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
+							{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<font color="red">{$EMAIL}</font>{/if}
+							</td></tr>
+						</table>
+						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
+						<p>
+							<font color="green">The email has been changed!</green>
+						</p>
+						{/if}
+						
+						<input type="hidden" name="function" value="change_mail">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<p>
+						<input type="submit" value="Change Email"/>
+						</p>
+					</form>
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+	    </table>
+	  </td>
+	</tr>
+      </table>
+      
+  </td></tr>
+	
+{/block}
+	
diff --git a/code/web/private_php/ams/ingame_templates/register.tpl b/code/web/private_php/ams/ingame_templates/register.tpl
index 7f34e8639..0f1d683a8 100644
--- a/code/web/private_php/ams/ingame_templates/register.tpl
+++ b/code/web/private_php/ams/ingame_templates/register.tpl
@@ -1,118 +1,118 @@
-{config_load file="ams_lib.conf" section="setup"}
-  <div class="title">
-    {$title} 
-  </div>
-
-  <div>
-    {$welcome_message}
-  </div>
-
-  {if $userRegistration == '0'|| $userRegistration == '1'}
-  
-  <form name="Page1"
-        method="post"
-        >
-    <table>
-      <tr>
-        <td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
-
-        <td width="25%">
-          <input type="text"
-               name="Username"
-               value="{if isset($Username)}{$Username}{/if}"
-               maxlength="12"
-               onfocus=
-               "javascript:showTooltip('{$username_tooltip}', this);" />
-        </td>
-        
-        <td id="comment-Username" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}{$USERNAME}{/if}</td>
-      </tr>
-
-      <tr>
-        <td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td>
-
-        <td width="25%">
-          <input type="password"
-               name="Password"
-               value=""
-               maxlength="20"
-               onkeyup=
-               "testPassword(document.Page1.Password.value, 'comment-Password')"
-               onfocus="javascript:showTooltip('{$password_message}', this);" />
-        </td>
-
-        <td id="comment-Password" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$PASSWORD}{/if}</td>
-      </tr>
-
-      <tr>
-        <td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td>
-
-        <td width="25%"><input type="password"
-               name="ConfirmPass"
-               value=""
-               maxlength="20"
-               onfocus="javascript:showTooltip('{$cpassword_message}', this);" />
-        </td>
-
-        <td id="comment-ConfirmPass" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$CPASSWORD}{/if}</td>
-      </tr>
-
-      <tr>
-        <td width="33%" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td>
-
-        <td width="25%">
-          <input type="text"
-               name="Email"
-               value=""
-               maxlength="255"
-               onfocus=
-               "javascript:showTooltip('{$email_message}', this);" />
-        </td>
-
-        <td id="comment-Email" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$EMAIL}{/if}</td>
-      </tr>
-
-      <tr>
-        <td width=
-        "33%" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if}
-            colspan="2"><input type="checkbox"
-               name="TaC"
-               value="1"
-               onfocus="javascript:showTooltip('', this);" /><span id=
-               "caption-TaC">{$tac_tag}</span></td>
-                                {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}<td id="comment-TaC" class="error" width="42%">{$tac_message}</td>{/if}
-
-      </tr>
-    </table>
-    <div class="c1">
-      <input type="submit"
-           name="Submit"
-           value="Continue" />
-    </div>
-
-  </form>
-  
-  {/if}
-
-  <div id="signupTooltip"
-       class="c2"
-       inset=""></div>
-
-  <div id="tooltip-Username">
-    {$username_tooltip}
-  </div>
-
-
-  <div id="tooltip-Password">
-    {$password_message}
-  </div>
-
-  <div id="tooltip-ConfirmPass">
-    {$cpassword_message}
-  </div>
-
-  <div id="tooltip-Email">
-    {$email_message}
-  </div>
-
-  <div id="tooltip-TaC"></div>
+{config_load file="ams_lib.conf" section="setup"}
+  <div class="title">
+    {$title} 
+  </div>
+
+  <div>
+    {$welcome_message}
+  </div>
+
+  {if $userRegistration == '0'|| $userRegistration == '1'}
+  
+  <form name="Page1"
+        method="post"
+        >
+    <table>
+      <tr>
+        <td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
+
+        <td width="25%">
+          <input type="text"
+               name="Username"
+               value="{if isset($Username)}{$Username}{/if}"
+               maxlength="12"
+               onfocus=
+               "javascript:showTooltip('{$username_tooltip}', this);" />
+        </td>
+        
+        <td id="comment-Username" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}{$USERNAME}{/if}</td>
+      </tr>
+
+      <tr>
+        <td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td>
+
+        <td width="25%">
+          <input type="password"
+               name="Password"
+               value=""
+               maxlength="20"
+               onkeyup=
+               "testPassword(document.Page1.Password.value, 'comment-Password')"
+               onfocus="javascript:showTooltip('{$password_message}', this);" />
+        </td>
+
+        <td id="comment-Password" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$PASSWORD}{/if}</td>
+      </tr>
+
+      <tr>
+        <td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td>
+
+        <td width="25%"><input type="password"
+               name="ConfirmPass"
+               value=""
+               maxlength="20"
+               onfocus="javascript:showTooltip('{$cpassword_message}', this);" />
+        </td>
+
+        <td id="comment-ConfirmPass" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$CPASSWORD}{/if}</td>
+      </tr>
+
+      <tr>
+        <td width="33%" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td>
+
+        <td width="25%">
+          <input type="text"
+               name="Email"
+               value=""
+               maxlength="255"
+               onfocus=
+               "javascript:showTooltip('{$email_message}', this);" />
+        </td>
+
+        <td id="comment-Email" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$EMAIL}{/if}</td>
+      </tr>
+
+      <tr>
+        <td width=
+        "33%" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if}
+            colspan="2"><input type="checkbox"
+               name="TaC"
+               value="1"
+               onfocus="javascript:showTooltip('', this);" /><span id=
+               "caption-TaC">{$tac_tag}</span></td>
+                                {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}<td id="comment-TaC" class="error" width="42%">{$tac_message}</td>{/if}
+
+      </tr>
+    </table>
+    <div class="c1">
+      <input type="submit"
+           name="Submit"
+           value="Continue" />
+    </div>
+
+  </form>
+  
+  {/if}
+
+  <div id="signupTooltip"
+       class="c2"
+       inset=""></div>
+
+  <div id="tooltip-Username">
+    {$username_tooltip}
+  </div>
+
+
+  <div id="tooltip-Password">
+    {$password_message}
+  </div>
+
+  <div id="tooltip-ConfirmPass">
+    {$cpassword_message}
+  </div>
+
+  <div id="tooltip-Email">
+    {$email_message}
+  </div>
+
+  <div id="tooltip-TaC"></div>
diff --git a/code/web/private_php/ams/ingame_templates/settings.tpl b/code/web/private_php/ams/ingame_templates/settings.tpl
index e256e4429..6049bddba 100644
--- a/code/web/private_php/ams/ingame_templates/settings.tpl
+++ b/code/web/private_php/ams/ingame_templates/settings.tpl
@@ -1,247 +1,247 @@
-{block name=content}
-<tr><td>
-      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr bgcolor="{$second_menu_bg_color}" valign="middle">
-	  <td>
-	  <table>
-	    <tr>
-	      <td>
-		<table cellspacing="0" cellpadding="4">
-		  <tr>		    
-		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=show_user&id={$target_id}"><h7>Browse User</h7></a></td>
-		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=createticket&user_id={$target_id}"><h7>Send Ticket</h7></a></td>
-		    {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1}
-			{if $userPermission eq 1}
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Make Moderator</h7></a></td>
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
-			{else if $userPermission eq 2 }
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
-			{else if $userPermission eq 3 }
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
-			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Demote to Moderator</h7></a></td>
-			{/if}
-		    {/if}
-		  </tr>
-		</table>
-	      </td>
-	    </tr>
-	  </table>
-	  </td>
-	</tr>
-	<tr>
-		<td height="3" bgcolor="#000000"></td>
-	</tr>
-      </table>
-  </td></tr>
-
-    <tr><td>
-	<table width="100%" bgcolor="{$title_bg_color}" cellspacing="2">
-	<tr><td height="7"></td><td></td></tr>
-	<tr>
-		<td width="3%"></td>
-		<td width="100%" height="12" valign="middle"><h1>Change Settings of {$target_username}</h1></td>
-	</tr>
-	<tr>
-	  <td height="5"></td><td></td>
-	</tr>
-	</table>
-  </td></tr>
-  <tr><td>
-      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr bgcolor="#000000" valign="middle">
-	  <td>
-	    <table>
-	      <tr><td height="8"></td></tr>
-	    </table>
-	  </td>
-	</tr>
-	<tr><td height="2"></td></tr>
-	<tr><td height="1" bgcolor="#000000"></td></tr>
-	<tr><td height="10"></td></tr>
-	<tr valign="middle">
-	  <td>
-	    <table width="100%" height="100%" cellpadding="10">
-	      <tr><td>
-		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
-			<tr><td>
-				<table cellpadding="10">
-					<tr><td>
-						
-					<p><h3>Change Password</h3></p>
-					
-					<form id="changePassword" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
-						<table cellpadding="1">
-						{if !isset($changesOther) or $changesOther eq "FALSE"}
-						<tr>
-							<td valign="middle">
-							Current Password:
-							</td>
-							<td>
-							<input type="text" id="CurrentPass" name="CurrentPass" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
-							{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<font color="red">The password is incorrect</font>{/if}
-							</td>
-							</p>
-						</tr>
-						{/if}
-						<tr><td valign="middle">
-						New Password:
-						</td><td>
-						<input type="text" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
-						{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$newpass_error_message}</font>{/if}
-						</td></tr>
-							
-						<tr><td valign="middle">
-						Confirm New Password:
-						</td><td>
-						<input type="text" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
-						{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$confirmnewpass_error_message}</font>{/if}
-						</td></tr>  
-						</table>
-						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-						<p><font color="green">
-							The password has been changed!
-						</font></p>
-						{/if}
-						
-						
-						<input type="hidden" name="function" value="change_password">
-						<input type="hidden" name="target_id" value="{$target_id}">
-
-						<p><input type="submit" value="Change Password"/></p>
-
-					</form>		
-								
-					</td></tr>
-				</table>
-			</td></tr>
-		</table>
-	      </td></tr>
-	      <tr><td>
-		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
-			<tr><td>
-				<table cellpadding="10">
-					<tr><td>
-						<p><h3>Change Email</h3></p>
-						
-						<form id="changeEmail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
-						<table>
-							<tr><td valign="middle">
-							New Email:
-							</td><td>
-							<input type="text" class="input-xlarge" id="NewEmail" size="200" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
-							{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<font color="red">{$EMAIL}</font>{/if}
-							</td></tr>
-						</table>
-						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
-						<p>
-							<font color="green">The email has been changed!</green>
-						</p>
-						{/if}
-						
-						<input type="hidden" name="function" value="change_mail">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<p>
-						<input type="submit" value="Change Email"/>
-						</p>
-					</form>
-					</td></tr>
-				</table>
-			</td></tr>
-		</table>
-	      </td></tr>
-		<tr><td>
-		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
-			<tr><td>
-				<table cellpadding="10">
-					<tr><td>
-						<p><h3>Change Info</h3></p>
-						<form id="changeEmail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
-						<table>
-						<tr>
-							<td valign="middle">Firstname: </td>
-							<td><input type="text" id="FirstName" name="FirstName" placeholder="Your firstname" {if isset($FirstName) and $FirstName neq ""}value="{$FirstName}"{/if}></td>
-						</tr>
-						
-						<tr>
-							<td valign="middle">Lastname: </td>
-							<td><input type="text" id="LastName" name="LastName" placeholder="Your lastname" {if isset($LastName) and $LastName neq ""}value="{$LastName}"{/if}></td>
-						</tr>	
-						
-						<tr>
-							<td valign="middle">Country: </td>
-							<td><select name="Country">
-									{foreach from=$country_array key=k item=v}
-										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
-									{/foreach}
-							</select></td>	
-						</tr>
-						<tr>
-							<td valign="middle">Gender</td>
-							<td>
-								<select name="Gender">
-									<option value="0"{if isset($Gender) and $Gender eq 0}selected="selected"{/if}>Secret</option>
-									<option value="1"{if isset($Gender) and $Gender eq 1}selected="selected"{/if}>Male</option>
-									<option value="2"{if isset($Gender) and $Gender eq 2}selected="selected"{/if}>Female</option>
-								</select></td>
-							</td>
-						</tr>
-						</table>			
-						{if isset($info_updated) and $info_updated eq "OK"}
-						<p>
-							<font color="green">The Info has been updated!</font>
-						</p>
-						{/if}
-						
-						<input type="hidden" name="function" value="change_info">
-						<input type="hidden" name="target_id" value="{$target_id}">
-
-						<p>
-						<input type="submit" value="Change Info"/>
-						</p>
-					</form>
-						
-					</td></tr>
-				</table>
-			</td></tr>
-		</table>
-	      </td></tr>
-		<tr><td>
-		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
-			<tr><td>
-				<table cellpadding="10">
-					<tr><td>
-						<p><h3>Ticket-Update Mail Settings</h3></p>
-						<form id="changeReceiveMail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
-							<table>
-								<tr><td valign="middle">
-									Receive ticket updates
-								</td><td>
-									 <select name="ReceiveMail">	
-										<option value="1" {if isset($ReceiveMail) and $ReceiveMail eq 1}selected="selected"{/if}>Yes</option>
-										<option value="0" {if isset($ReceiveMail) and $ReceiveMail eq 0}selected="selected"{/if}>No</option>
-									</select>
-								</td></tr>
-							</table>
-							
-							<input type="hidden" name="function" value="change_receivemail">
-							<input type="hidden" name="target_id" value="{$target_id}">
-							<p>
-								<input type="submit" value="Change Updates"/>
-							</p>
-						</form>
-						
-					</td></tr>
-				</table>
-			</td></tr>
-		</table>
-	      </td></tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-      
-  </td></tr>
-	
-{/block}
-	
+{block name=content}
+<tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="{$second_menu_bg_color}" valign="middle">
+	  <td>
+	  <table>
+	    <tr>
+	      <td>
+		<table cellspacing="0" cellpadding="4">
+		  <tr>		    
+		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=show_user&id={$target_id}"><h7>Browse User</h7></a></td>
+		    <td valign="middle" nowrap><a href="{$ingame_webpath}?page=createticket&user_id={$target_id}"><h7>Send Ticket</h7></a></td>
+		    {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1}
+			{if $userPermission eq 1}
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Make Moderator</h7></a></td>
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
+			{else if $userPermission eq 2 }
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=3"><h7>Make Admin</h7></a></td>
+			{else if $userPermission eq 3 }
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=1"><h7>Demote to User</h7></a></td>
+			<td valign="middle" nowrap><a href="{$ingame_webpath}?page=change_permission&user_id={$target_id}&value=2"><h7>Demote to Moderator</h7></a></td>
+			{/if}
+		    {/if}
+		  </tr>
+		</table>
+	      </td>
+	    </tr>
+	  </table>
+	  </td>
+	</tr>
+	<tr>
+		<td height="3" bgcolor="#000000"></td>
+	</tr>
+      </table>
+  </td></tr>
+
+    <tr><td>
+	<table width="100%" bgcolor="{$title_bg_color}" cellspacing="2">
+	<tr><td height="7"></td><td></td></tr>
+	<tr>
+		<td width="3%"></td>
+		<td width="100%" height="12" valign="middle"><h1>Change Settings of {$target_username}</h1></td>
+	</tr>
+	<tr>
+	  <td height="5"></td><td></td>
+	</tr>
+	</table>
+  </td></tr>
+  <tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="#000000" valign="middle">
+	  <td>
+	    <table>
+	      <tr><td height="8"></td></tr>
+	    </table>
+	  </td>
+	</tr>
+	<tr><td height="2"></td></tr>
+	<tr><td height="1" bgcolor="#000000"></td></tr>
+	<tr><td height="10"></td></tr>
+	<tr valign="middle">
+	  <td>
+	    <table width="100%" height="100%" cellpadding="10">
+	      <tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						
+					<p><h3>Change Password</h3></p>
+					
+					<form id="changePassword" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
+						<table cellpadding="1">
+						{if !isset($changesOther) or $changesOther eq "FALSE"}
+						<tr>
+							<td valign="middle">
+							Current Password:
+							</td>
+							<td>
+							<input type="text" id="CurrentPass" name="CurrentPass" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
+							{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<font color="red">The password is incorrect</font>{/if}
+							</td>
+							</p>
+						</tr>
+						{/if}
+						<tr><td valign="middle">
+						New Password:
+						</td><td>
+						<input type="text" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
+						{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$newpass_error_message}</font>{/if}
+						</td></tr>
+							
+						<tr><td valign="middle">
+						Confirm New Password:
+						</td><td>
+						<input type="text" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
+						{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$confirmnewpass_error_message}</font>{/if}
+						</td></tr>  
+						</table>
+						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
+						<p><font color="green">
+							The password has been changed!
+						</font></p>
+						{/if}
+						
+						
+						<input type="hidden" name="function" value="change_password">
+						<input type="hidden" name="target_id" value="{$target_id}">
+
+						<p><input type="submit" value="Change Password"/></p>
+
+					</form>		
+								
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+	      <tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						<p><h3>Change Email</h3></p>
+						
+						<form id="changeEmail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
+						<table>
+							<tr><td valign="middle">
+							New Email:
+							</td><td>
+							<input type="text" class="input-xlarge" id="NewEmail" size="200" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
+							{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<font color="red">{$EMAIL}</font>{/if}
+							</td></tr>
+						</table>
+						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
+						<p>
+							<font color="green">The email has been changed!</green>
+						</p>
+						{/if}
+						
+						<input type="hidden" name="function" value="change_mail">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<p>
+						<input type="submit" value="Change Email"/>
+						</p>
+					</form>
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+		<tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						<p><h3>Change Info</h3></p>
+						<form id="changeEmail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
+						<table>
+						<tr>
+							<td valign="middle">Firstname: </td>
+							<td><input type="text" id="FirstName" name="FirstName" placeholder="Your firstname" {if isset($FirstName) and $FirstName neq ""}value="{$FirstName}"{/if}></td>
+						</tr>
+						
+						<tr>
+							<td valign="middle">Lastname: </td>
+							<td><input type="text" id="LastName" name="LastName" placeholder="Your lastname" {if isset($LastName) and $LastName neq ""}value="{$LastName}"{/if}></td>
+						</tr>	
+						
+						<tr>
+							<td valign="middle">Country: </td>
+							<td><select name="Country">
+									{foreach from=$country_array key=k item=v}
+										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
+									{/foreach}
+							</select></td>	
+						</tr>
+						<tr>
+							<td valign="middle">Gender</td>
+							<td>
+								<select name="Gender">
+									<option value="0"{if isset($Gender) and $Gender eq 0}selected="selected"{/if}>Secret</option>
+									<option value="1"{if isset($Gender) and $Gender eq 1}selected="selected"{/if}>Male</option>
+									<option value="2"{if isset($Gender) and $Gender eq 2}selected="selected"{/if}>Female</option>
+								</select></td>
+							</td>
+						</tr>
+						</table>			
+						{if isset($info_updated) and $info_updated eq "OK"}
+						<p>
+							<font color="green">The Info has been updated!</font>
+						</p>
+						{/if}
+						
+						<input type="hidden" name="function" value="change_info">
+						<input type="hidden" name="target_id" value="{$target_id}">
+
+						<p>
+						<input type="submit" value="Change Info"/>
+						</p>
+					</form>
+						
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+		<tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						<p><h3>Ticket-Update Mail Settings</h3></p>
+						<form id="changeReceiveMail" class="form-vertical" method="post" action="{$ingame_webpath}?page=settings&id={$target_id}">
+							<table>
+								<tr><td valign="middle">
+									Receive ticket updates
+								</td><td>
+									 <select name="ReceiveMail">	
+										<option value="1" {if isset($ReceiveMail) and $ReceiveMail eq 1}selected="selected"{/if}>Yes</option>
+										<option value="0" {if isset($ReceiveMail) and $ReceiveMail eq 0}selected="selected"{/if}>No</option>
+									</select>
+								</td></tr>
+							</table>
+							
+							<input type="hidden" name="function" value="change_receivemail">
+							<input type="hidden" name="target_id" value="{$target_id}">
+							<p>
+								<input type="submit" value="Change Updates"/>
+							</p>
+						</form>
+						
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+	    </table>
+	  </td>
+	</tr>
+      </table>
+      
+  </td></tr>
+	
+{/block}
+	
diff --git a/code/web/public_php/admin/templates/default/index_login.tpl b/code/web/public_php/admin/templates/default/index_login.tpl
index f62a03998..7b18df28e 100644
--- a/code/web/public_php/admin/templates/default/index_login.tpl
+++ b/code/web/public_php/admin/templates/default/index_login.tpl
@@ -1,25 +1,25 @@
-
-{include file="page_header_light.tpl"}
-
-<h2>Shard Administration Website</h2>
-
-<p>Use login: <b>guest</b> and password: <b>guest</b> to login.</p>
-
-<table width="30%" border="0">
-<form action="index.php" method="post">
-	<tr>
-		<td>Login:</td>
-		<td><input type="text" name="nel_login" value="guest"></td>
-	</tr>
-	<tr>
-		<td>Password:</td>
-		<td><input type="password" name="nel_passwd" value="guest"></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="submit" name="action" value="login">
-	</tr>
-</form>
-</table>
-
-{include file="page_footer_light.tpl"}
+
+{include file="page_header_light.tpl"}
+
+<h2>Shard Administration Website</h2>
+
+<p>Use login: <b>guest</b> and password: <b>guest</b> to login.</p>
+
+<table width="30%" border="0">
+<form action="index.php" method="post">
+	<tr>
+		<td>Login:</td>
+		<td><input type="text" name="nel_login" value="guest"></td>
+	</tr>
+	<tr>
+		<td>Password:</td>
+		<td><input type="password" name="nel_passwd" value="guest"></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td><input type="submit" name="action" value="login">
+	</tr>
+</form>
+</table>
+
+{include file="page_footer_light.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_actions.tpl b/code/web/public_php/admin/templates/default/tool_actions.tpl
index a8c9e614a..3ceacb946 100644
--- a/code/web/public_php/admin/templates/default/tool_actions.tpl
+++ b/code/web/public_php/admin/templates/default/tool_actions.tpl
@@ -1,6 +1,6 @@
-
-{include file="page_header.tpl"}
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_applications.tpl b/code/web/public_php/admin/templates/default/tool_administration_applications.tpl
index 824d34325..45dc12839 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_applications.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_applications.tpl
@@ -1,115 +1,115 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Applications</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Name</b></td>
-			<td><b>URI</b></td>
-			<td><b>Restriction</b></td>
-			<td><b>Icon</b></td>
-			<td><b>Order</b></td>
-			<td><b>Visible</b></td>
-		</tr>
-{section name=application loop=$tool_application_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_application_list[application].application_id}</td>
-			<td><a href="tool_administration.php?toolmode=applications&toolaction=edit&application_id={$tool_application_list[application].application_id}">{$tool_application_list[application].application_name}</a></td>
-			<td>{$tool_application_list[application].application_uri}</td>
-			<td>{$tool_application_list[application].application_restriction}</td>
-			<td>{$tool_application_list[application].application_icon}</td>
-			<td>{$tool_application_list[application].application_order}</td>
-			<td>{if $tool_application_list[application].application_visible  == 1}Yes{else}No{/if}</td>
-		</tr>
-{/section}
-		</table>
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=applications" method="post">
-		<tr>
-			<th colspan="10">Applications Details</th>
-		</tr>
-{if $tool_application_edit_data.application_id}
-		<tr>
-			<td align="right">Id :</td>
-			<td><input type="text" name="tool_form_application_id" value="{$tool_application_edit_data.application_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td align="right">Name :</td>
-			<td><input type="text" name="tool_form_application_name" value="{$tool_application_edit_data.application_name}" maxlength="64" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">URI :</td>
-			<td><input type="text" name="tool_form_application_uri" value="{$tool_application_edit_data.application_uri}" maxlength="255" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Restriction :</td>
-			<td><input type="text" name="tool_form_application_restriction" value="{$tool_application_edit_data.application_restriction}" maxlength="64" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Icon :</td>
-			<td><input type="text" name="tool_form_application_icon" value="{$tool_application_edit_data.application_icon}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Order :</td>
-			<td><input type="text" name="tool_form_application_order" value="{$tool_application_edit_data.application_order}" maxlength="6" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Visible :</td>
-			<td>
-				<select name="tool_form_application_visible">
-					<option value="1" {if $tool_application_edit_data.application_visible == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_application_edit_data.application_visible == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-
-{if $tool_application_edit_data.application_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the application &lt; {$tool_application_edit_data.application_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-	</td>
-
-</tr>
-</table>
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Applications</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Name</b></td>
+			<td><b>URI</b></td>
+			<td><b>Restriction</b></td>
+			<td><b>Icon</b></td>
+			<td><b>Order</b></td>
+			<td><b>Visible</b></td>
+		</tr>
+{section name=application loop=$tool_application_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_application_list[application].application_id}</td>
+			<td><a href="tool_administration.php?toolmode=applications&toolaction=edit&application_id={$tool_application_list[application].application_id}">{$tool_application_list[application].application_name}</a></td>
+			<td>{$tool_application_list[application].application_uri}</td>
+			<td>{$tool_application_list[application].application_restriction}</td>
+			<td>{$tool_application_list[application].application_icon}</td>
+			<td>{$tool_application_list[application].application_order}</td>
+			<td>{if $tool_application_list[application].application_visible  == 1}Yes{else}No{/if}</td>
+		</tr>
+{/section}
+		</table>
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=applications" method="post">
+		<tr>
+			<th colspan="10">Applications Details</th>
+		</tr>
+{if $tool_application_edit_data.application_id}
+		<tr>
+			<td align="right">Id :</td>
+			<td><input type="text" name="tool_form_application_id" value="{$tool_application_edit_data.application_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td align="right">Name :</td>
+			<td><input type="text" name="tool_form_application_name" value="{$tool_application_edit_data.application_name}" maxlength="64" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">URI :</td>
+			<td><input type="text" name="tool_form_application_uri" value="{$tool_application_edit_data.application_uri}" maxlength="255" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Restriction :</td>
+			<td><input type="text" name="tool_form_application_restriction" value="{$tool_application_edit_data.application_restriction}" maxlength="64" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Icon :</td>
+			<td><input type="text" name="tool_form_application_icon" value="{$tool_application_edit_data.application_icon}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Order :</td>
+			<td><input type="text" name="tool_form_application_order" value="{$tool_application_edit_data.application_order}" maxlength="6" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Visible :</td>
+			<td>
+				<select name="tool_form_application_visible">
+					<option value="1" {if $tool_application_edit_data.application_visible == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_application_edit_data.application_visible == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+
+{if $tool_application_edit_data.application_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the application &lt; {$tool_application_edit_data.application_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+	</td>
+
+</tr>
+</table>
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_domains.tpl b/code/web/public_php/admin/templates/default/tool_administration_domains.tpl
index 3262aee9d..fa61386a5 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_domains.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_domains.tpl
@@ -1,185 +1,185 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="12">Domains</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Name</b></td>
-			<td><b>Application</b></td>
-			<td><b>AS Host</b></td>
-			<td><b>AS Port</b></td>
-			<td><b>MFS Web</b></td>
-			<td><b>RRD Path</b></td>
-			<td><b>LAS Admin Path</b></td>
-			<td><b>LAS Local Path</b></td>
-			<td><b>Ring DB</b></td>
-			<td><b>CS DB</b></td>
-			<td><b>HD Check</b></td>
-		</tr>
-{section name=domain loop=$tool_domain_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_domain_list[domain].domain_id}</td>
-			<td><a href="tool_administration.php?toolmode=domains&toolaction=edit&domain_id={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
-			<td>{$tool_domain_list[domain].domain_application}</td>
-			<td>{$tool_domain_list[domain].domain_as_host}</td>
-			<td>{$tool_domain_list[domain].domain_as_port}</td>
-			<td>{$tool_domain_list[domain].domain_mfs_web}</td>
-			<td>{$tool_domain_list[domain].domain_rrd_path}</td>
-			<td>{$tool_domain_list[domain].domain_las_admin_path}</td>
-			<td>{$tool_domain_list[domain].domain_las_local_path}</td>
-			<td>{if $tool_domain_list[domain].domain_sql_string != ''}True{else}False{/if}</td>
-			<td>{if $tool_domain_list[domain].domain_cs_sql_string != ''}True{else}False{/if}</td>
-			<td>{if $tool_domain_list[domain].domain_hd_check == 1}Yes{else}No{/if}</td>
-		</tr>
-{/section}
-		</table>
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=domains" method="post">
-		<tr>
-			<th colspan="10">Domain Details</th>
-		</tr>
-{if $tool_domain_edit_data.domain_id}
-		<tr>
-			<td align="right">Id :</td>
-			<td><input type="text" name="tool_form_domain_id" value="{$tool_domain_edit_data.domain_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td align="right">Name :</td>
-			<td><input type="text" name="tool_form_domain_name" value="{$tool_domain_edit_data.domain_name}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Application :</td>
-			<td><input type="text" name="tool_form_domain_application" value="{$tool_domain_edit_data.domain_application}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">AS Host :</td>
-			<td><input type="text" name="tool_form_domain_as_host" value="{$tool_domain_edit_data.domain_as_host}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">AS Port :</td>
-			<td><input type="text" name="tool_form_domain_as_port" value="{$tool_domain_edit_data.domain_as_port}" maxlength="5" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">MFS Web :</td>
-			<td><input type="text" name="tool_form_domain_mfs_web" value="{$tool_domain_edit_data.domain_mfs_web}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">RRD Path :</td>
-			<td><input type="text" name="tool_form_domain_rrd_path" value="{$tool_domain_edit_data.domain_rrd_path}" maxlength="255" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">LAS Admin Path :</td>
-			<td><input type="text" name="tool_form_domain_las_admin_path" value="{$tool_domain_edit_data.domain_las_admin_path}" maxlength="255" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">LAS Local Path :</td>
-			<td><input type="text" name="tool_form_domain_las_local_path" value="{$tool_domain_edit_data.domain_las_local_path}" maxlength="255" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Ring DB String :</td>
-			<td><input type="text" name="tool_form_domain_sql_string" value="{$tool_domain_edit_data.domain_sql_string}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">CS DB String :</td>
-			<td><input type="text" name="tool_form_domain_cs_sql_string" value="{$tool_domain_edit_data.domain_cs_sql_string}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">HD Check :</td>
-			<td>
-				<select name="tool_form_domain_hd_check">
-					<option value="1" {if $tool_domain_edit_data.domain_hd_check == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_domain_edit_data.domain_hd_check == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-
-{if $tool_domain_edit_data.domain_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the domain &lt; {$tool_domain_edit_data.domain_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-
-{if $tool_domain_nel_data}
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=domains" method="post">
-		<tr>
-			<th colspan="10">Domain Data</th>
-		</tr>
-		<tr>
-			<td align="right">ID :</td>
-			<td><input type="text" name="tool_form_domain_nel_id" value="{$tool_domain_nel_data.domain_id}" maxlength="128" size="30" readonly ></td>
-		</tr>
-		<tr>
-			<td align="right">Name :</td>
-			<td><input type="text" name="tool_form_domain_nel_name" value="{$tool_domain_nel_data.domain_name}" maxlength="128" size="30" readonly ></td>
-		</tr>
-		<!--<tr>
-			<td align="right">Version :</td>
-			<td><input type="text" name="tool_form_domain_nel_version" value="{$tool_domain_nel_data.patch_version}" maxlength="128" size="30"></td>
-		</tr>-->
-		<tr>
-			<td align="right">Status :</td>
-			<td><select name="tool_form_domain_nel_status" style="width:150px;">
-{section name=status loop=$tool_domain_nel_status}
-					<option value="{$tool_domain_nel_status[status]}" {if $tool_domain_nel_data.status == $tool_domain_nel_status[status]}selected{/if}>{$tool_domain_nel_status[status]}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-				<input type="submit" name="toolaction" value="update_nel">
-				<input type="hidden" name="tool_form_domain_id" value="{$tool_domain_edit_data.domain_id}">
-			</td>
-		</tr>
-		</form>
-		</table>
-{/if}
-
-	</td>
-
-</tr>
-</table>
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="12">Domains</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Name</b></td>
+			<td><b>Application</b></td>
+			<td><b>AS Host</b></td>
+			<td><b>AS Port</b></td>
+			<td><b>MFS Web</b></td>
+			<td><b>RRD Path</b></td>
+			<td><b>LAS Admin Path</b></td>
+			<td><b>LAS Local Path</b></td>
+			<td><b>Ring DB</b></td>
+			<td><b>CS DB</b></td>
+			<td><b>HD Check</b></td>
+		</tr>
+{section name=domain loop=$tool_domain_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_domain_list[domain].domain_id}</td>
+			<td><a href="tool_administration.php?toolmode=domains&toolaction=edit&domain_id={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
+			<td>{$tool_domain_list[domain].domain_application}</td>
+			<td>{$tool_domain_list[domain].domain_as_host}</td>
+			<td>{$tool_domain_list[domain].domain_as_port}</td>
+			<td>{$tool_domain_list[domain].domain_mfs_web}</td>
+			<td>{$tool_domain_list[domain].domain_rrd_path}</td>
+			<td>{$tool_domain_list[domain].domain_las_admin_path}</td>
+			<td>{$tool_domain_list[domain].domain_las_local_path}</td>
+			<td>{if $tool_domain_list[domain].domain_sql_string != ''}True{else}False{/if}</td>
+			<td>{if $tool_domain_list[domain].domain_cs_sql_string != ''}True{else}False{/if}</td>
+			<td>{if $tool_domain_list[domain].domain_hd_check == 1}Yes{else}No{/if}</td>
+		</tr>
+{/section}
+		</table>
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=domains" method="post">
+		<tr>
+			<th colspan="10">Domain Details</th>
+		</tr>
+{if $tool_domain_edit_data.domain_id}
+		<tr>
+			<td align="right">Id :</td>
+			<td><input type="text" name="tool_form_domain_id" value="{$tool_domain_edit_data.domain_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td align="right">Name :</td>
+			<td><input type="text" name="tool_form_domain_name" value="{$tool_domain_edit_data.domain_name}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Application :</td>
+			<td><input type="text" name="tool_form_domain_application" value="{$tool_domain_edit_data.domain_application}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">AS Host :</td>
+			<td><input type="text" name="tool_form_domain_as_host" value="{$tool_domain_edit_data.domain_as_host}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">AS Port :</td>
+			<td><input type="text" name="tool_form_domain_as_port" value="{$tool_domain_edit_data.domain_as_port}" maxlength="5" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">MFS Web :</td>
+			<td><input type="text" name="tool_form_domain_mfs_web" value="{$tool_domain_edit_data.domain_mfs_web}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">RRD Path :</td>
+			<td><input type="text" name="tool_form_domain_rrd_path" value="{$tool_domain_edit_data.domain_rrd_path}" maxlength="255" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">LAS Admin Path :</td>
+			<td><input type="text" name="tool_form_domain_las_admin_path" value="{$tool_domain_edit_data.domain_las_admin_path}" maxlength="255" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">LAS Local Path :</td>
+			<td><input type="text" name="tool_form_domain_las_local_path" value="{$tool_domain_edit_data.domain_las_local_path}" maxlength="255" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Ring DB String :</td>
+			<td><input type="text" name="tool_form_domain_sql_string" value="{$tool_domain_edit_data.domain_sql_string}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">CS DB String :</td>
+			<td><input type="text" name="tool_form_domain_cs_sql_string" value="{$tool_domain_edit_data.domain_cs_sql_string}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">HD Check :</td>
+			<td>
+				<select name="tool_form_domain_hd_check">
+					<option value="1" {if $tool_domain_edit_data.domain_hd_check == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_domain_edit_data.domain_hd_check == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+
+{if $tool_domain_edit_data.domain_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the domain &lt; {$tool_domain_edit_data.domain_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+
+{if $tool_domain_nel_data}
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=domains" method="post">
+		<tr>
+			<th colspan="10">Domain Data</th>
+		</tr>
+		<tr>
+			<td align="right">ID :</td>
+			<td><input type="text" name="tool_form_domain_nel_id" value="{$tool_domain_nel_data.domain_id}" maxlength="128" size="30" readonly ></td>
+		</tr>
+		<tr>
+			<td align="right">Name :</td>
+			<td><input type="text" name="tool_form_domain_nel_name" value="{$tool_domain_nel_data.domain_name}" maxlength="128" size="30" readonly ></td>
+		</tr>
+		<!--<tr>
+			<td align="right">Version :</td>
+			<td><input type="text" name="tool_form_domain_nel_version" value="{$tool_domain_nel_data.patch_version}" maxlength="128" size="30"></td>
+		</tr>-->
+		<tr>
+			<td align="right">Status :</td>
+			<td><select name="tool_form_domain_nel_status" style="width:150px;">
+{section name=status loop=$tool_domain_nel_status}
+					<option value="{$tool_domain_nel_status[status]}" {if $tool_domain_nel_data.status == $tool_domain_nel_status[status]}selected{/if}>{$tool_domain_nel_status[status]}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+				<input type="submit" name="toolaction" value="update_nel">
+				<input type="hidden" name="tool_form_domain_id" value="{$tool_domain_edit_data.domain_id}">
+			</td>
+		</tr>
+		</form>
+		</table>
+{/if}
+
+	</td>
+
+</tr>
+</table>
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_groups.tpl b/code/web/public_php/admin/templates/default/tool_administration_groups.tpl
index 3dedf7067..be7235734 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_groups.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_groups.tpl
@@ -1,334 +1,334 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Groups</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Name</b></td>
-			<td><b>Level</b></td>
-			<td><b>Default</b></td>
-			<td><b>Active</b></td>
-		</tr>
-{section name=group loop=$tool_group_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_group_list[group].group_id}</td>
-			<td><a href="tool_administration.php?toolmode=groups&toolaction=edit&group_id={$tool_group_list[group].group_id}">{$tool_group_list[group].group_name}</a></td>
-			<td>{$tool_group_list[group].group_level_name}</td>
-			<td>{if $tool_group_list[group].group_default == 1}Yes{else}No{/if}</td>
-			<td>{if $tool_group_list[group].group_active  == 1}Yes{else}No{/if}</td>
-		</tr>
-{/section}
-		</table>
-
-{if $tool_group_user_list}
-		<br>
-
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Accounts</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Login</b></td>
-			<td><b>Created</b></td>
-			<td><b>Last&nbsp;Logged</b></td>
-			<td><b>Num&nbsp;Logs</b></td>
-			<td><b>Active</b></td>
-		</tr>
-{section name=user loop=$tool_group_user_list}
-{cycle assign="trclass2" values="row1,row0"}
-		<tr class="{$trclass2}">
-			<td>{$tool_group_user_list[user].user_id}</td>
-			<td><a href="tool_administration.php?toolmode=users&toolaction=edit&user_id={$tool_group_user_list[user].user_id}">{$tool_group_user_list[user].user_name}</a></td>
-			<td>{$tool_group_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}</td>
-{if $tool_group_user_list[user].user_logged_last > 0}
-			<td>{$tool_group_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}</td>
-{else}
-			<td>never</td>
-{/if}
-			<td>{$tool_group_user_list[user].user_logged_count}</td>
-			<td>{if $tool_group_user_list[user].user_active == 1}Yes{else}No{/if}</td>
-		</tr>
-{/section}
-		</table>
-{/if}
-
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Group Details</th>
-		</tr>
-{if $tool_group_edit_data.group_id}
-		<tr>
-			<td width="40%" align="right">Id :</td>
-			<td><input type="text" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td width="40%" align="right">Name :</td>
-			<td><input type="text" name="tool_form_group_name" value="{$tool_group_edit_data.group_name}" maxlength="32" size="30" {* if $tool_group_edit_data.group_id}readonly{/if *}></td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Level :</td>
-			<td>
-				<select name="tool_form_group_level">
-{section name=level loop=$tool_group_level_list}
-					<option value="{$tool_group_level_list[level].level_id}" {if $tool_group_edit_data.group_level == $tool_group_level_list[level].level_id}selected{/if}>{$tool_group_level_list[level].level_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Default :</td>
-			<td>
-				<select name="tool_form_group_default">
-					<option value="1" {if $tool_group_edit_data.group_default == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_group_edit_data.group_default == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Active :</td>
-			<td>
-				<select name="tool_form_group_active">
-					<option value="1" {if $tool_group_edit_data.group_active == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_group_edit_data.group_active == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-
-{if $tool_group_edit_data.group_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the group &lt; {$tool_group_edit_data.group_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-
-{if $tool_group_edit_data.group_id}
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Default Domain</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Domains :</td>
-			<td>
-				<select name="tool_form_domain_default" style="width:150px;">
-					<option value="0">-- none --</option>
-{section name=domain loop=$tool_domain_list}
-{if $tool_domain_list[domain].domain_selected}
-					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_group_edit_data.group_default_domain_id == $tool_domain_list[domain].domain_id}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
-{/if}
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
-				<input type="submit" name="toolaction" value="update default domain">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-{if $tool_group_edit_data.group_default_domain_id > 0}
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Default Shard</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Shards :</td>
-			<td>
-				<select name="tool_form_shard_default" style="width:150px;">
-					<option value="0">-- none --</option>
-{section name=domain loop=$tool_shard_list}
-{if $tool_shard_list[domain].domain_id == $tool_group_edit_data.group_default_domain_id}
-
-{if $tool_shard_list[domain].domain_visible}
-{section name=shard loop=$tool_shard_list[domain].shard_list}
-{if $tool_shard_list[domain].shard_list[shard].shard_selected}
-					<option value="{$tool_shard_list[domain].shard_list[shard].shard_id}" {if $tool_group_edit_data.group_default_shard_id == $tool_shard_list[domain].shard_list[shard].shard_id}selected{/if}>{$tool_shard_list[domain].shard_list[shard].shard_name}</option>
-{/if}
-{/section}
-{/if}
-
-{/if}
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
-				<input type="submit" name="toolaction" value="update default shard">
-			</td>
-		</tr>
-		</form>
-		</table>
-{/if}
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Default Application</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Application :</td>
-			<td>
-				<select name="tool_form_application_default" style="width:150px;">
-					<!--<option value="0">-- none --</option>-->
-{section name=menu loop=$nel_menu}
-{if $nel_menu[menu].application_order != 999999}
-		<option value="{$nel_menu[menu].application_id}" {if $tool_group_edit_data.group_default_application_id == $nel_menu[menu].application_id}selected{/if}>{$nel_menu[menu].application_name}</option>
-{/if}
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
-				<input type="submit" name="toolaction" value="update default application">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Application Access</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Applications :</td>
-			<td>
-				<select name="tool_form_application_ids[]" multiple size="10" style="width:150px;">
-{section name=appl loop=$tool_application_list}
-					<option value="{$tool_application_list[appl].application_id}" {if $tool_application_list[appl].application_restriction == ""}disabled{elseif $tool_application_list[appl].application_selected}selected{/if}>{$tool_application_list[appl].application_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
-				<input type="submit" name="toolaction" value="update applications">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Domain Access</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Domains :</td>
-			<td>
-				<select name="tool_form_domain_ids[]" multiple size="5" style="width:150px;">
-{section name=domain loop=$tool_domain_list}
-					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_domain_list[domain].domain_selected}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
-				<input type="submit" name="toolaction" value="update domains">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=groups" method="post">
-		<tr>
-			<th colspan="10">Shard Access</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Shards :</td>
-			<td>
-				<select name="tool_form_shard_ids[]" multiple size="20" style="width:150px;">
-{section name=domain loop=$tool_shard_list}
-{if $tool_shard_list[domain].domain_visible}
-					<option disabled >Domain : {$tool_shard_list[domain].domain_name}</option>
-{section name=shard loop=$tool_shard_list[domain].shard_list}
-					<option value="{$tool_shard_list[domain].domain_id}_{$tool_shard_list[domain].shard_list[shard].shard_id}" {if $tool_shard_list[domain].shard_list[shard].shard_disabled}disabled{elseif $tool_shard_list[domain].shard_list[shard].shard_selected}selected{/if}> +-- {$tool_shard_list[domain].shard_list[shard].shard_name}</option>
-{/section}
-					<option disabled></option>
-{/if}
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
-				<input type="submit" name="toolaction" value="update shards">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-{/if}
-
-	</td>
-
-</tr>
-</table>
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Groups</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Name</b></td>
+			<td><b>Level</b></td>
+			<td><b>Default</b></td>
+			<td><b>Active</b></td>
+		</tr>
+{section name=group loop=$tool_group_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_group_list[group].group_id}</td>
+			<td><a href="tool_administration.php?toolmode=groups&toolaction=edit&group_id={$tool_group_list[group].group_id}">{$tool_group_list[group].group_name}</a></td>
+			<td>{$tool_group_list[group].group_level_name}</td>
+			<td>{if $tool_group_list[group].group_default == 1}Yes{else}No{/if}</td>
+			<td>{if $tool_group_list[group].group_active  == 1}Yes{else}No{/if}</td>
+		</tr>
+{/section}
+		</table>
+
+{if $tool_group_user_list}
+		<br>
+
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Accounts</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Login</b></td>
+			<td><b>Created</b></td>
+			<td><b>Last&nbsp;Logged</b></td>
+			<td><b>Num&nbsp;Logs</b></td>
+			<td><b>Active</b></td>
+		</tr>
+{section name=user loop=$tool_group_user_list}
+{cycle assign="trclass2" values="row1,row0"}
+		<tr class="{$trclass2}">
+			<td>{$tool_group_user_list[user].user_id}</td>
+			<td><a href="tool_administration.php?toolmode=users&toolaction=edit&user_id={$tool_group_user_list[user].user_id}">{$tool_group_user_list[user].user_name}</a></td>
+			<td>{$tool_group_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}</td>
+{if $tool_group_user_list[user].user_logged_last > 0}
+			<td>{$tool_group_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}</td>
+{else}
+			<td>never</td>
+{/if}
+			<td>{$tool_group_user_list[user].user_logged_count}</td>
+			<td>{if $tool_group_user_list[user].user_active == 1}Yes{else}No{/if}</td>
+		</tr>
+{/section}
+		</table>
+{/if}
+
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Group Details</th>
+		</tr>
+{if $tool_group_edit_data.group_id}
+		<tr>
+			<td width="40%" align="right">Id :</td>
+			<td><input type="text" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td width="40%" align="right">Name :</td>
+			<td><input type="text" name="tool_form_group_name" value="{$tool_group_edit_data.group_name}" maxlength="32" size="30" {* if $tool_group_edit_data.group_id}readonly{/if *}></td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Level :</td>
+			<td>
+				<select name="tool_form_group_level">
+{section name=level loop=$tool_group_level_list}
+					<option value="{$tool_group_level_list[level].level_id}" {if $tool_group_edit_data.group_level == $tool_group_level_list[level].level_id}selected{/if}>{$tool_group_level_list[level].level_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Default :</td>
+			<td>
+				<select name="tool_form_group_default">
+					<option value="1" {if $tool_group_edit_data.group_default == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_group_edit_data.group_default == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Active :</td>
+			<td>
+				<select name="tool_form_group_active">
+					<option value="1" {if $tool_group_edit_data.group_active == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_group_edit_data.group_active == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+
+{if $tool_group_edit_data.group_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the group &lt; {$tool_group_edit_data.group_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+
+{if $tool_group_edit_data.group_id}
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Default Domain</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Domains :</td>
+			<td>
+				<select name="tool_form_domain_default" style="width:150px;">
+					<option value="0">-- none --</option>
+{section name=domain loop=$tool_domain_list}
+{if $tool_domain_list[domain].domain_selected}
+					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_group_edit_data.group_default_domain_id == $tool_domain_list[domain].domain_id}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
+{/if}
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
+				<input type="submit" name="toolaction" value="update default domain">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+{if $tool_group_edit_data.group_default_domain_id > 0}
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Default Shard</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Shards :</td>
+			<td>
+				<select name="tool_form_shard_default" style="width:150px;">
+					<option value="0">-- none --</option>
+{section name=domain loop=$tool_shard_list}
+{if $tool_shard_list[domain].domain_id == $tool_group_edit_data.group_default_domain_id}
+
+{if $tool_shard_list[domain].domain_visible}
+{section name=shard loop=$tool_shard_list[domain].shard_list}
+{if $tool_shard_list[domain].shard_list[shard].shard_selected}
+					<option value="{$tool_shard_list[domain].shard_list[shard].shard_id}" {if $tool_group_edit_data.group_default_shard_id == $tool_shard_list[domain].shard_list[shard].shard_id}selected{/if}>{$tool_shard_list[domain].shard_list[shard].shard_name}</option>
+{/if}
+{/section}
+{/if}
+
+{/if}
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
+				<input type="submit" name="toolaction" value="update default shard">
+			</td>
+		</tr>
+		</form>
+		</table>
+{/if}
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Default Application</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Application :</td>
+			<td>
+				<select name="tool_form_application_default" style="width:150px;">
+					<!--<option value="0">-- none --</option>-->
+{section name=menu loop=$nel_menu}
+{if $nel_menu[menu].application_order != 999999}
+		<option value="{$nel_menu[menu].application_id}" {if $tool_group_edit_data.group_default_application_id == $nel_menu[menu].application_id}selected{/if}>{$nel_menu[menu].application_name}</option>
+{/if}
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
+				<input type="submit" name="toolaction" value="update default application">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Application Access</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Applications :</td>
+			<td>
+				<select name="tool_form_application_ids[]" multiple size="10" style="width:150px;">
+{section name=appl loop=$tool_application_list}
+					<option value="{$tool_application_list[appl].application_id}" {if $tool_application_list[appl].application_restriction == ""}disabled{elseif $tool_application_list[appl].application_selected}selected{/if}>{$tool_application_list[appl].application_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
+				<input type="submit" name="toolaction" value="update applications">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Domain Access</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Domains :</td>
+			<td>
+				<select name="tool_form_domain_ids[]" multiple size="5" style="width:150px;">
+{section name=domain loop=$tool_domain_list}
+					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_domain_list[domain].domain_selected}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
+				<input type="submit" name="toolaction" value="update domains">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=groups" method="post">
+		<tr>
+			<th colspan="10">Shard Access</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Shards :</td>
+			<td>
+				<select name="tool_form_shard_ids[]" multiple size="20" style="width:150px;">
+{section name=domain loop=$tool_shard_list}
+{if $tool_shard_list[domain].domain_visible}
+					<option disabled >Domain : {$tool_shard_list[domain].domain_name}</option>
+{section name=shard loop=$tool_shard_list[domain].shard_list}
+					<option value="{$tool_shard_list[domain].domain_id}_{$tool_shard_list[domain].shard_list[shard].shard_id}" {if $tool_shard_list[domain].shard_list[shard].shard_disabled}disabled{elseif $tool_shard_list[domain].shard_list[shard].shard_selected}selected{/if}> +-- {$tool_shard_list[domain].shard_list[shard].shard_name}</option>
+{/section}
+					<option disabled></option>
+{/if}
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_group_id" value="{$tool_group_edit_data.group_id}">
+				<input type="submit" name="toolaction" value="update shards">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+{/if}
+
+	</td>
+
+</tr>
+</table>
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_logs.tpl b/code/web/public_php/admin/templates/default/tool_administration_logs.tpl
index a2f537a8e..b44d3719b 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_logs.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_logs.tpl
@@ -1,56 +1,56 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Logs</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>User</b></td>
-			<td><b>Date</b></td>
-			<td><b>Action</b></td>
-		</tr>
-{section name=log loop=$tool_log_list}
-		<tr class="{cycle values="row1,row0"}">
-			<td>{$tool_log_list[log].logs_id}</td>
-			<td>{$tool_log_list[log].logs_user_name}</td>
-			<td>{$tool_log_list[log].logs_date|date_format:"%Y/%m/%d %H:%M:%S"}</td>
-			<td>{$tool_log_list[log].logs_data}</td>
-		</tr>
-{/section}
-		<tr>
-			<th colspan="4" align="center">
-<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_first}">|&lt;</a>&nbsp;&nbsp;&nbsp;
-<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_previous}">&lt;</a>&nbsp;&nbsp;&nbsp;
-Page {$tool_log_page_current} / {$tool_log_page_total}&nbsp;&nbsp;&nbsp;
-<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_next}">&gt;</a>&nbsp;&nbsp;&nbsp;
-<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_last}">&gt;|</a>
-			</th>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Logs</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>User</b></td>
+			<td><b>Date</b></td>
+			<td><b>Action</b></td>
+		</tr>
+{section name=log loop=$tool_log_list}
+		<tr class="{cycle values="row1,row0"}">
+			<td>{$tool_log_list[log].logs_id}</td>
+			<td>{$tool_log_list[log].logs_user_name}</td>
+			<td>{$tool_log_list[log].logs_date|date_format:"%Y/%m/%d %H:%M:%S"}</td>
+			<td>{$tool_log_list[log].logs_data}</td>
+		</tr>
+{/section}
+		<tr>
+			<th colspan="4" align="center">
+<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_first}">|&lt;</a>&nbsp;&nbsp;&nbsp;
+<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_previous}">&lt;</a>&nbsp;&nbsp;&nbsp;
+Page {$tool_log_page_current} / {$tool_log_page_total}&nbsp;&nbsp;&nbsp;
+<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_next}">&gt;</a>&nbsp;&nbsp;&nbsp;
+<a href="tool_administration.php?toolmode=logs&page={$tool_log_page_last}">&gt;|</a>
+			</th>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl b/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
index 37e856f09..d31e4a65e 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
@@ -1,172 +1,172 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Restart Groups</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Name</b></td>
-			<td><b>List</b></td>
-			<td><b>Order</b></td>
-		</tr>
-{section name=restart loop=$tool_restart_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_restart_list[restart].restart_group_id}</td>
-			<td><a href="tool_administration.php?toolmode=restarts&toolaction=edit&restart_id={$tool_restart_list[restart].restart_group_id}">{$tool_restart_list[restart].restart_group_name}</a></td>
-			<td>{$tool_restart_list[restart].restart_group_list}</td>
-			<td>{$tool_restart_list[restart].restart_group_order}</td>
-		</tr>
-{/section}
-		</table>
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=restarts" method="post">
-		<tr>
-			<th colspan="10">Restart Group Details</th>
-		</tr>
-{if $tool_restart_edit_data.restart_group_id}
-		<tr>
-			<td align="right">Id :</td>
-			<td><input type="text" name="tool_form_restart_id" value="{$tool_restart_edit_data.restart_group_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td align="right">Name :</td>
-			<td><input type="text" name="tool_form_restart_name" value="{$tool_restart_edit_data.restart_group_name}" maxlength="128" size="40"></td>
-		</tr>
-		<tr>
-			<td align="right">Services :</td>
-			<td><input type="text" name="tool_form_restart_services" value="{$tool_restart_edit_data.restart_group_list}" maxlength="255" size="40"></td>
-		</tr>
-		<tr>
-			<td align="right">Order :</td>
-			<td><input type="text" name="tool_form_restart_order" value="{$tool_restart_edit_data.restart_group_order}" maxlength="3" size="10"></td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-
-{if $tool_restart_edit_data.restart_group_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the restart group &lt; {$tool_restart_edit_data.restart_group_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-	</td>
-
-</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Restart Messages</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Language</b></td>
-			<td><b>Name</b></td>
-			<td><b>Value</b></td>
-		</tr>
-{section name=msg loop=$tool_message_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_message_list[msg].restart_message_id}</td>
-			<td>{$tool_message_list[msg].restart_message_lang}</td>
-			<td><a href="tool_administration.php?toolmode=restarts&toolaction=editmsg&msg_id={$tool_message_list[msg].restart_message_id}">{$tool_message_list[msg].restart_message_name}</a></td>
-			<td>{$tool_message_list[msg].restart_message_value}</td>
-		</tr>
-{/section}
-		</table>
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=restarts" method="post">
-		<tr>
-			<th colspan="10">Restart Message Details</th>
-		</tr>
-{if $tool_message_edit_data.restart_message_id}
-		<tr>
-			<td align="right">Id :</td>
-			<td><input type="text" name="tool_form_message_id" value="{$tool_message_edit_data.restart_message_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td align="right">Name :</td>
-			<td><input type="text" name="tool_form_message_name" value="{$tool_message_edit_data.restart_message_name}" maxlength="32" size="40"></td>
-		</tr>
-		<tr>
-			<td align="right">Value :</td>
-			<td><input type="text" name="tool_form_message_value" value="{$tool_message_edit_data.restart_message_value}" maxlength="255" size="40"></td>
-		</tr>
-		<tr>
-			<td align="right">Language :</td>
-			<td>
-				<select name="tool_form_message_lang">
-{section name=lang loop=$tool_language_list}
-					<option value="{$tool_language_list[lang].lang_id}" {if $tool_message_edit_data.restart_message_lang == $tool_language_list[lang].lang_id}selected{/if}>{$tool_language_list[lang].lang_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-
-{if $tool_message_edit_data.restart_message_id }
-				<input type="submit" name="toolaction" value="update message">
-				<input type="submit" name="toolaction" value="delete message" onclick="if (confirm('Are you sure you want to DELETE the restart message &lt; {$tool_message_edit_data.restart_message_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create message">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-	</td>
-
-</tr>
-</table>
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Restart Groups</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Name</b></td>
+			<td><b>List</b></td>
+			<td><b>Order</b></td>
+		</tr>
+{section name=restart loop=$tool_restart_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_restart_list[restart].restart_group_id}</td>
+			<td><a href="tool_administration.php?toolmode=restarts&toolaction=edit&restart_id={$tool_restart_list[restart].restart_group_id}">{$tool_restart_list[restart].restart_group_name}</a></td>
+			<td>{$tool_restart_list[restart].restart_group_list}</td>
+			<td>{$tool_restart_list[restart].restart_group_order}</td>
+		</tr>
+{/section}
+		</table>
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=restarts" method="post">
+		<tr>
+			<th colspan="10">Restart Group Details</th>
+		</tr>
+{if $tool_restart_edit_data.restart_group_id}
+		<tr>
+			<td align="right">Id :</td>
+			<td><input type="text" name="tool_form_restart_id" value="{$tool_restart_edit_data.restart_group_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td align="right">Name :</td>
+			<td><input type="text" name="tool_form_restart_name" value="{$tool_restart_edit_data.restart_group_name}" maxlength="128" size="40"></td>
+		</tr>
+		<tr>
+			<td align="right">Services :</td>
+			<td><input type="text" name="tool_form_restart_services" value="{$tool_restart_edit_data.restart_group_list}" maxlength="255" size="40"></td>
+		</tr>
+		<tr>
+			<td align="right">Order :</td>
+			<td><input type="text" name="tool_form_restart_order" value="{$tool_restart_edit_data.restart_group_order}" maxlength="3" size="10"></td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+
+{if $tool_restart_edit_data.restart_group_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the restart group &lt; {$tool_restart_edit_data.restart_group_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+	</td>
+
+</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Restart Messages</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Language</b></td>
+			<td><b>Name</b></td>
+			<td><b>Value</b></td>
+		</tr>
+{section name=msg loop=$tool_message_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_message_list[msg].restart_message_id}</td>
+			<td>{$tool_message_list[msg].restart_message_lang}</td>
+			<td><a href="tool_administration.php?toolmode=restarts&toolaction=editmsg&msg_id={$tool_message_list[msg].restart_message_id}">{$tool_message_list[msg].restart_message_name}</a></td>
+			<td>{$tool_message_list[msg].restart_message_value}</td>
+		</tr>
+{/section}
+		</table>
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=restarts" method="post">
+		<tr>
+			<th colspan="10">Restart Message Details</th>
+		</tr>
+{if $tool_message_edit_data.restart_message_id}
+		<tr>
+			<td align="right">Id :</td>
+			<td><input type="text" name="tool_form_message_id" value="{$tool_message_edit_data.restart_message_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td align="right">Name :</td>
+			<td><input type="text" name="tool_form_message_name" value="{$tool_message_edit_data.restart_message_name}" maxlength="32" size="40"></td>
+		</tr>
+		<tr>
+			<td align="right">Value :</td>
+			<td><input type="text" name="tool_form_message_value" value="{$tool_message_edit_data.restart_message_value}" maxlength="255" size="40"></td>
+		</tr>
+		<tr>
+			<td align="right">Language :</td>
+			<td>
+				<select name="tool_form_message_lang">
+{section name=lang loop=$tool_language_list}
+					<option value="{$tool_language_list[lang].lang_id}" {if $tool_message_edit_data.restart_message_lang == $tool_language_list[lang].lang_id}selected{/if}>{$tool_language_list[lang].lang_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+
+{if $tool_message_edit_data.restart_message_id }
+				<input type="submit" name="toolaction" value="update message">
+				<input type="submit" name="toolaction" value="delete message" onclick="if (confirm('Are you sure you want to DELETE the restart message &lt; {$tool_message_edit_data.restart_message_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create message">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+	</td>
+
+</tr>
+</table>
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_shards.tpl b/code/web/public_php/admin/templates/default/tool_administration_shards.tpl
index c5ebdc00f..03ceb06b9 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_shards.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_shards.tpl
@@ -1,110 +1,110 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Shards</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Name</b></td>
-			<td><b>Shard ID</b></td>
-			<td><b>Domain</b></td>
-			<td><b>Language</b></td>
-		</tr>
-{section name=shard loop=$tool_shard_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_shard_list[shard].shard_id}</td>
-			<td><a href="tool_administration.php?toolmode=shards&toolaction=edit&shard_id={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
-			<td>{$tool_shard_list[shard].shard_as_id}</td>
-			<td>{$tool_shard_list[shard].domain_name}</td>
-			<td>{$tool_shard_list[shard].shard_lang}</td>
-		</tr>
-{/section}
-		</table>
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=shards" method="post">
-		<tr>
-			<th colspan="10">Shard Details</th>
-		</tr>
-{if $tool_shard_edit_data.shard_id}
-		<tr>
-			<td align="right">Id :</td>
-			<td><input type="text" name="tool_form_shard_id" value="{$tool_shard_edit_data.shard_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td align="right">Name :</td>
-			<td><input type="text" name="tool_form_shard_name" value="{$tool_shard_edit_data.shard_name}" maxlength="128" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Shard ID :</td>
-			<td><input type="text" name="tool_form_shard_as_id" value="{$tool_shard_edit_data.shard_as_id}" maxlength="255" size="30"></td>
-		</tr>
-		<tr>
-			<td align="right">Domain :</td>
-			<td>
-				<select name="tool_form_shard_domain_id">
-{section name=domain loop=$tool_domain_list}
-					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_shard_edit_data.shard_domain_id == $tool_domain_list[domain].domain_id}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">Language :</td>
-			<td>
-				<select name="tool_form_shard_language">
-{section name=lang loop=$tool_language_list}
-					<option value="{$tool_language_list[lang].lang_id}" {if $tool_shard_edit_data.shard_lang == $tool_language_list[lang].lang_id}selected{/if}>{$tool_language_list[lang].lang_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-
-{if $tool_shard_edit_data.shard_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the shard &lt; {$tool_shard_edit_data.shard_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-	</td>
-
-</tr>
-</table>
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Shards</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Name</b></td>
+			<td><b>Shard ID</b></td>
+			<td><b>Domain</b></td>
+			<td><b>Language</b></td>
+		</tr>
+{section name=shard loop=$tool_shard_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_shard_list[shard].shard_id}</td>
+			<td><a href="tool_administration.php?toolmode=shards&toolaction=edit&shard_id={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
+			<td>{$tool_shard_list[shard].shard_as_id}</td>
+			<td>{$tool_shard_list[shard].domain_name}</td>
+			<td>{$tool_shard_list[shard].shard_lang}</td>
+		</tr>
+{/section}
+		</table>
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=shards" method="post">
+		<tr>
+			<th colspan="10">Shard Details</th>
+		</tr>
+{if $tool_shard_edit_data.shard_id}
+		<tr>
+			<td align="right">Id :</td>
+			<td><input type="text" name="tool_form_shard_id" value="{$tool_shard_edit_data.shard_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td align="right">Name :</td>
+			<td><input type="text" name="tool_form_shard_name" value="{$tool_shard_edit_data.shard_name}" maxlength="128" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Shard ID :</td>
+			<td><input type="text" name="tool_form_shard_as_id" value="{$tool_shard_edit_data.shard_as_id}" maxlength="255" size="30"></td>
+		</tr>
+		<tr>
+			<td align="right">Domain :</td>
+			<td>
+				<select name="tool_form_shard_domain_id">
+{section name=domain loop=$tool_domain_list}
+					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_shard_edit_data.shard_domain_id == $tool_domain_list[domain].domain_id}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td align="right">Language :</td>
+			<td>
+				<select name="tool_form_shard_language">
+{section name=lang loop=$tool_language_list}
+					<option value="{$tool_language_list[lang].lang_id}" {if $tool_shard_edit_data.shard_lang == $tool_language_list[lang].lang_id}selected{/if}>{$tool_language_list[lang].lang_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+
+{if $tool_shard_edit_data.shard_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the shard &lt; {$tool_shard_edit_data.shard_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+	</td>
+
+</tr>
+</table>
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_users.tpl b/code/web/public_php/admin/templates/default/tool_administration_users.tpl
index d2d81a85b..5950d21ca 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_users.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_users.tpl
@@ -1,207 +1,207 @@
-
-{include file="page_header.tpl"}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="70%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Accounts</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Login</b></td>
-			<td><b>Group</b></td>
-			<td><b>Created</b></td>
-			<td><b>Last&nbsp;Logged</b></td>
-			<td><b>Num&nbsp;Logs</b></td>
-			<td><b>Active</b></td>
-		</tr>
-{section name=user loop=$tool_user_list}
-{cycle assign="trclass" values="row1,row0"}
-		<tr class="{$trclass}">
-			<td>{$tool_user_list[user].user_id}</td>
-			<td><a href="tool_administration.php?toolmode=users&toolaction=edit&user_id={$tool_user_list[user].user_id}">{$tool_user_list[user].user_name}</a></td>
-			<td><a href="tool_administration.php?toolmode=groups&toolaction=edit&group_id={$tool_user_list[user].user_group_id}">{$tool_user_list[user].user_group_name}</a></td>
-			<td>{$tool_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}</td>
-{if $tool_user_list[user].user_logged_last > 0}
-			<td>{$tool_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}</td>
-{else}
-			<td>never</td>
-{/if}
-			<td>{$tool_user_list[user].user_logged_count}</td>
-			<td>{if $tool_user_list[user].user_active == 1}Yes{else}No{/if}</td>
-		</tr>
-{/section}
-		</table>
-	</td>
-
-
-	<td align="right" valign="top" width="30%">
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=users" method="post">
-		<tr>
-			<th colspan="10">Account Details</th>
-		</tr>
-{if $tool_user_edit_data.user_id}
-		<tr>
-			<td width="40%" align="right">Id :</td>
-			<td><input type="text" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td width="40%" align="right">Name :</td>
-			<td><input type="text" name="tool_form_user_name" value="{$tool_user_edit_data.user_name}" maxlength="32" size="30"></td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Password :</td>
-			<td><input type="password" name="tool_form_user_password" value="" maxlength="16" size="30"></td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Group :</td>
-			<td>
-				<select name="tool_form_user_group">
-{section name=group loop=$tool_group_list}
-					<option value="{$tool_group_list[group].group_id}" {if $tool_user_edit_data.user_group_id == $tool_group_list[group].group_id}selected{/if}>{$tool_group_list[group].group_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Active :</td>
-			<td>
-				<select name="tool_form_user_active">
-					<option value="1" {if $tool_user_edit_data.user_active == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_user_edit_data.user_active == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-
-{if $tool_user_edit_data.user_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the user &lt; {$tool_user_edit_data.user_name} &gt; ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-
-{if $tool_user_edit_data.user_id}
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=users" method="post">
-		<tr>
-			<th colspan="10">Application Access</th>
-		</tr>
-		<tr>
-			<td align="right" width="40%">Applications :</td>
-			<td>
-				<select name="tool_form_application_ids[]" multiple size="10" style="width:150px;">
-{section name=appl loop=$tool_application_list}
-					<option value="{$tool_application_list[appl].application_id}" {if $tool_application_list[appl].application_restriction == "" || $tool_application_list[appl].application_disabled}disabled{elseif $tool_application_list[appl].application_selected}selected{/if}>{$tool_application_list[appl].application_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}">
-				<input type="submit" name="toolaction" value="update applications">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=users" method="post">
-		<tr>
-			<th colspan="10">Domain Access</th>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Domains :</td>
-			<td>
-				<select name="tool_form_domain_ids[]" multiple size="5" style="width:150px;">
-{section name=domain loop=$tool_domain_list}
-					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_domain_list[domain].domain_disabled}disabled{elseif $tool_domain_list[domain].domain_selected}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}">
-				<input type="submit" name="toolaction" value="update domains">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-		<br>
-		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_administration.php?toolmode=users" method="post">
-		<tr>
-			<th colspan="10">Shard Access {if $tool_domain_list[domain].domain_disabled}(group){/if}</th>
-		</tr>
-		<tr>
-			<td width="40%" align="right">Shards :</td>
-			<td>
-				<select name="tool_form_shard_ids[]" multiple size="20" style="width:150px;">
-{section name=domain loop=$tool_shard_list}
-{if $tool_shard_list[domain].domain_visible}
-					<option value="" disabled >Domain : {$tool_shard_list[domain].domain_name}</option>
-{section name=shard loop=$tool_shard_list[domain].shard_list}
-					<option value="{$tool_shard_list[domain].domain_id}_{$tool_shard_list[domain].shard_list[shard].shard_id}" {if $tool_shard_list[domain].shard_list[shard].shard_disabled}disabled{elseif $tool_shard_list[domain].shard_list[shard].shard_selected}selected{/if}> +-- {$tool_shard_list[domain].shard_list[shard].shard_name}</option>
-{/section}
-					<option disabled></option>
-{/if}
-{/section}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="40%">&nbsp;</td>
-			<td>
-				<input type="hidden" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}">
-				{* <input type="hidden" name="tool_form_domain_id" value="{$tool_shard_list[domain].domain_id}"> *}
-				<input type="submit" name="toolaction" value="update shards">
-			</td>
-		</tr>
-		</form>
-		</table>
-
-{/if}
-
-	</td>
-
-</tr>
-</table>
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="70%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Accounts</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Login</b></td>
+			<td><b>Group</b></td>
+			<td><b>Created</b></td>
+			<td><b>Last&nbsp;Logged</b></td>
+			<td><b>Num&nbsp;Logs</b></td>
+			<td><b>Active</b></td>
+		</tr>
+{section name=user loop=$tool_user_list}
+{cycle assign="trclass" values="row1,row0"}
+		<tr class="{$trclass}">
+			<td>{$tool_user_list[user].user_id}</td>
+			<td><a href="tool_administration.php?toolmode=users&toolaction=edit&user_id={$tool_user_list[user].user_id}">{$tool_user_list[user].user_name}</a></td>
+			<td><a href="tool_administration.php?toolmode=groups&toolaction=edit&group_id={$tool_user_list[user].user_group_id}">{$tool_user_list[user].user_group_name}</a></td>
+			<td>{$tool_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}</td>
+{if $tool_user_list[user].user_logged_last > 0}
+			<td>{$tool_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}</td>
+{else}
+			<td>never</td>
+{/if}
+			<td>{$tool_user_list[user].user_logged_count}</td>
+			<td>{if $tool_user_list[user].user_active == 1}Yes{else}No{/if}</td>
+		</tr>
+{/section}
+		</table>
+	</td>
+
+
+	<td align="right" valign="top" width="30%">
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=users" method="post">
+		<tr>
+			<th colspan="10">Account Details</th>
+		</tr>
+{if $tool_user_edit_data.user_id}
+		<tr>
+			<td width="40%" align="right">Id :</td>
+			<td><input type="text" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td width="40%" align="right">Name :</td>
+			<td><input type="text" name="tool_form_user_name" value="{$tool_user_edit_data.user_name}" maxlength="32" size="30"></td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Password :</td>
+			<td><input type="password" name="tool_form_user_password" value="" maxlength="16" size="30"></td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Group :</td>
+			<td>
+				<select name="tool_form_user_group">
+{section name=group loop=$tool_group_list}
+					<option value="{$tool_group_list[group].group_id}" {if $tool_user_edit_data.user_group_id == $tool_group_list[group].group_id}selected{/if}>{$tool_group_list[group].group_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Active :</td>
+			<td>
+				<select name="tool_form_user_active">
+					<option value="1" {if $tool_user_edit_data.user_active == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_user_edit_data.user_active == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+
+{if $tool_user_edit_data.user_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE the user &lt; {$tool_user_edit_data.user_name} &gt; ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+
+{if $tool_user_edit_data.user_id}
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=users" method="post">
+		<tr>
+			<th colspan="10">Application Access</th>
+		</tr>
+		<tr>
+			<td align="right" width="40%">Applications :</td>
+			<td>
+				<select name="tool_form_application_ids[]" multiple size="10" style="width:150px;">
+{section name=appl loop=$tool_application_list}
+					<option value="{$tool_application_list[appl].application_id}" {if $tool_application_list[appl].application_restriction == "" || $tool_application_list[appl].application_disabled}disabled{elseif $tool_application_list[appl].application_selected}selected{/if}>{$tool_application_list[appl].application_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}">
+				<input type="submit" name="toolaction" value="update applications">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=users" method="post">
+		<tr>
+			<th colspan="10">Domain Access</th>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Domains :</td>
+			<td>
+				<select name="tool_form_domain_ids[]" multiple size="5" style="width:150px;">
+{section name=domain loop=$tool_domain_list}
+					<option value="{$tool_domain_list[domain].domain_id}" {if $tool_domain_list[domain].domain_disabled}disabled{elseif $tool_domain_list[domain].domain_selected}selected{/if}>{$tool_domain_list[domain].domain_name}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}">
+				<input type="submit" name="toolaction" value="update domains">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+		<br>
+		<table width="90%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_administration.php?toolmode=users" method="post">
+		<tr>
+			<th colspan="10">Shard Access {if $tool_domain_list[domain].domain_disabled}(group){/if}</th>
+		</tr>
+		<tr>
+			<td width="40%" align="right">Shards :</td>
+			<td>
+				<select name="tool_form_shard_ids[]" multiple size="20" style="width:150px;">
+{section name=domain loop=$tool_shard_list}
+{if $tool_shard_list[domain].domain_visible}
+					<option value="" disabled >Domain : {$tool_shard_list[domain].domain_name}</option>
+{section name=shard loop=$tool_shard_list[domain].shard_list}
+					<option value="{$tool_shard_list[domain].domain_id}_{$tool_shard_list[domain].shard_list[shard].shard_id}" {if $tool_shard_list[domain].shard_list[shard].shard_disabled}disabled{elseif $tool_shard_list[domain].shard_list[shard].shard_selected}selected{/if}> +-- {$tool_shard_list[domain].shard_list[shard].shard_name}</option>
+{/section}
+					<option disabled></option>
+{/if}
+{/section}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="40%">&nbsp;</td>
+			<td>
+				<input type="hidden" name="tool_form_user_id" value="{$tool_user_edit_data.user_id}">
+				{* <input type="hidden" name="tool_form_domain_id" value="{$tool_shard_list[domain].domain_id}"> *}
+				<input type="submit" name="toolaction" value="update shards">
+			</td>
+		</tr>
+		</form>
+		</table>
+
+{/if}
+
+	</td>
+
+</tr>
+</table>
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs.tpl b/code/web/public_php/admin/templates/default/tool_graphs.tpl
index 24e2d4eaa..9dcd896a5 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs.tpl
@@ -1,274 +1,274 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-<script language="Javascript" type="text/javascript">
-<!--
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	var total_secs;
-
-	function TimerDown(secs)
-	{
-		total_secs = secs;
-		CountDown();
-	}
-
-	function TimerDisplay(secs)
-	{
-		timer_min = Math.floor(secs / 60);
-		timer_sec = secs % 60;
-
-		if (timer_min < 10) timer_min = '0'+ timer_min;
-		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
-
-		return timer_min+':'+timer_sec;
-	}
-
-	function CountDown()
-	{
-		total_secs--;
-		if (total_secs >= 0)
-		{
-			document.fcounter.counter.value = TimerDisplay(total_secs);
-			down=setTimeout("CountDown()",1000);
-		}
-	}
-
-	function toggleBox(mybox1, mybox2)
-	{
-		if (document.all)
-		{
-			if (document.all.item(mybox1).style.display == "none")
-			{
-				document.all.item(mybox1).style.display = "";
-				document.all.item(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.all.item(mybox2).style.display = "";
-				document.all.item(mybox1).style.display = "none";
-			}
-		}
-		else
-		{
-			if (document.getElementById(mybox1).style.display == "none")
-			{
-				document.getElementById(mybox1).style.display = "";
-				document.getElementById(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.getElementById(mybox2).style.display = "";
-				document.getElementById(mybox1).style.display = "none";
-			}
-		}
-	}
-
-//-->
-</script>
-{/literal}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="10">
-<tr>
-	<td align="left" valign="top" width="150px">
-
-{if $tool_domain_selected && $tool_shard_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Refresh</th>
-		</tr>
-		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
-		<tr>
-			<td>
-				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
-{section name=refresh loop=$tool_refresh_list}
-					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-{if $tool_refresh_rate > 0}
-		<tr>
-			<td>
-				<input type="text" name="counter" value="" readonly class="refresh_counter">
-				<script language="Javascript" type="text/javascript">
-					<!--
-					TimerDown({$tool_refresh_rate});
-					-->
-				</script>
-			</td>
-		</tr>
-{/if}
-		</form>
-		</table>
-		<br>
-{/if}
-
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Domains</th>
-		</tr>
-{section name=domain loop=$tool_domain_list}
-		<tr>
-			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{if $tool_domain_selected}
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Shards</th>
-		</tr>
-{section name=shard loop=$tool_shard_list}
-{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
-		<tr>
-			<td align="center" class="{if $tool_shard_selected == $tool_shard_list[shard].shard_id}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
-		</tr>
-{/if}
-{/section}
-		</table>
-
-{if $tool_frame_list}
-<!--		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Time Frame</th>
-		</tr>
-{section name=frame loop=$tool_frame_list}
-		<tr>
-			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&frame={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
-		</tr>
-{/section}
-		</table>-->
-{/if}
-
-{if $tool_graph_list}
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Graphs</th>
-		</tr>
-{section name=gvar loop=$tool_graph_variables}
-		<tr class="row1_static" style="border: 1px solid #000000;">
-			<td align="left"><b>{$tool_graph_variables[gvar]}</b></td>
-			<!--<td align="center"><small>Low</small></td>-->
-			<td align="center"><small>High</small></td>
-		</tr>
-{assign var="var_name" value=$tool_graph_variables[gvar]}
-{section name=gdata loop=$tool_graph_datas.$var_name}
-		<tr class="{if ($tool_graph_variable_selected == $var_name) && ($tool_graph_service_selected == $tool_graph_datas.$var_name[gdata].service)}varlistselected{else}varlist{/if}">
-			<td align="left"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&variable={$var_name}&service={$tool_graph_datas.$var_name[gdata].service}">{$tool_graph_datas.$var_name[gdata].service}</a></td>
-			<!--<td align="center"><small>{if $tool_graph_datas.$var_name[gdata].low_file != ''}Yes{else}No{/if}</small></td>-->
-			<td align="center"><small>{if $tool_graph_datas.$var_name[gdata].high_file != ''}Yes{else}No{/if}</small></td>
-		</tr>
-{/section}
-{/section}
-		</table>
-{/if}
-
-{/if}
-
-	</td>
-
-	<td width="10px">&nbsp;</td>
-
-	<td align="right" valign="top">
-
-{if $tool_domain_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
-		</tr>
-		</table>
-{elseif !$tool_domain_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a domain.</td>
-		</tr>
-		</table>
-{else}
-{if $tool_as_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
-		</tr>
-		</table>
-		<br>
-{/if}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0" width="50%" valign="top">
-{if $tool_rrd_output}
-{section name=rrd loop=$tool_rrd_output}
-				{$tool_rrd_output[rrd].desc}<br>
-				<img src="{$tool_rrd_output[rrd].img}" border="0"><br>
-{/section}
-{/if}
-			</td>
-			<td class="row0" width="50%" valign="top">
-{if $tool_rrd_high_output}
-{section name=rrd loop=$tool_rrd_high_output}
-				<b>{$tool_rrd_high_output[rrd].desc}</b><br>
-{if $tool_rrd_high_output[rrd].img != ''}
-				<img src="{$tool_rrd_high_output[rrd].img}" border="0"><br>
-{/if}
-{/section}
-{/if}
-			</td>
-		</tr>
-		</table>
-{/if}
-
-	</td>
-</tr>
-</table>
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+<script language="Javascript" type="text/javascript">
+<!--
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	var total_secs;
+
+	function TimerDown(secs)
+	{
+		total_secs = secs;
+		CountDown();
+	}
+
+	function TimerDisplay(secs)
+	{
+		timer_min = Math.floor(secs / 60);
+		timer_sec = secs % 60;
+
+		if (timer_min < 10) timer_min = '0'+ timer_min;
+		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
+
+		return timer_min+':'+timer_sec;
+	}
+
+	function CountDown()
+	{
+		total_secs--;
+		if (total_secs >= 0)
+		{
+			document.fcounter.counter.value = TimerDisplay(total_secs);
+			down=setTimeout("CountDown()",1000);
+		}
+	}
+
+	function toggleBox(mybox1, mybox2)
+	{
+		if (document.all)
+		{
+			if (document.all.item(mybox1).style.display == "none")
+			{
+				document.all.item(mybox1).style.display = "";
+				document.all.item(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.all.item(mybox2).style.display = "";
+				document.all.item(mybox1).style.display = "none";
+			}
+		}
+		else
+		{
+			if (document.getElementById(mybox1).style.display == "none")
+			{
+				document.getElementById(mybox1).style.display = "";
+				document.getElementById(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.getElementById(mybox2).style.display = "";
+				document.getElementById(mybox1).style.display = "none";
+			}
+		}
+	}
+
+//-->
+</script>
+{/literal}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="10">
+<tr>
+	<td align="left" valign="top" width="150px">
+
+{if $tool_domain_selected && $tool_shard_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Refresh</th>
+		</tr>
+		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
+		<tr>
+			<td>
+				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
+{section name=refresh loop=$tool_refresh_list}
+					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+{if $tool_refresh_rate > 0}
+		<tr>
+			<td>
+				<input type="text" name="counter" value="" readonly class="refresh_counter">
+				<script language="Javascript" type="text/javascript">
+					<!--
+					TimerDown({$tool_refresh_rate});
+					-->
+				</script>
+			</td>
+		</tr>
+{/if}
+		</form>
+		</table>
+		<br>
+{/if}
+
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Domains</th>
+		</tr>
+{section name=domain loop=$tool_domain_list}
+		<tr>
+			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{if $tool_domain_selected}
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Shards</th>
+		</tr>
+{section name=shard loop=$tool_shard_list}
+{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
+		<tr>
+			<td align="center" class="{if $tool_shard_selected == $tool_shard_list[shard].shard_id}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
+		</tr>
+{/if}
+{/section}
+		</table>
+
+{if $tool_frame_list}
+<!--		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Time Frame</th>
+		</tr>
+{section name=frame loop=$tool_frame_list}
+		<tr>
+			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&frame={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
+		</tr>
+{/section}
+		</table>-->
+{/if}
+
+{if $tool_graph_list}
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Graphs</th>
+		</tr>
+{section name=gvar loop=$tool_graph_variables}
+		<tr class="row1_static" style="border: 1px solid #000000;">
+			<td align="left"><b>{$tool_graph_variables[gvar]}</b></td>
+			<!--<td align="center"><small>Low</small></td>-->
+			<td align="center"><small>High</small></td>
+		</tr>
+{assign var="var_name" value=$tool_graph_variables[gvar]}
+{section name=gdata loop=$tool_graph_datas.$var_name}
+		<tr class="{if ($tool_graph_variable_selected == $var_name) && ($tool_graph_service_selected == $tool_graph_datas.$var_name[gdata].service)}varlistselected{else}varlist{/if}">
+			<td align="left"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&variable={$var_name}&service={$tool_graph_datas.$var_name[gdata].service}">{$tool_graph_datas.$var_name[gdata].service}</a></td>
+			<!--<td align="center"><small>{if $tool_graph_datas.$var_name[gdata].low_file != ''}Yes{else}No{/if}</small></td>-->
+			<td align="center"><small>{if $tool_graph_datas.$var_name[gdata].high_file != ''}Yes{else}No{/if}</small></td>
+		</tr>
+{/section}
+{/section}
+		</table>
+{/if}
+
+{/if}
+
+	</td>
+
+	<td width="10px">&nbsp;</td>
+
+	<td align="right" valign="top">
+
+{if $tool_domain_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
+		</tr>
+		</table>
+{elseif !$tool_domain_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a domain.</td>
+		</tr>
+		</table>
+{else}
+{if $tool_as_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
+		</tr>
+		</table>
+		<br>
+{/if}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0" width="50%" valign="top">
+{if $tool_rrd_output}
+{section name=rrd loop=$tool_rrd_output}
+				{$tool_rrd_output[rrd].desc}<br>
+				<img src="{$tool_rrd_output[rrd].img}" border="0"><br>
+{/section}
+{/if}
+			</td>
+			<td class="row0" width="50%" valign="top">
+{if $tool_rrd_high_output}
+{section name=rrd loop=$tool_rrd_high_output}
+				<b>{$tool_rrd_high_output[rrd].desc}</b><br>
+{if $tool_rrd_high_output[rrd].img != ''}
+				<img src="{$tool_rrd_high_output[rrd].img}" border="0"><br>
+{/if}
+{/section}
+{/if}
+			</td>
+		</tr>
+		</table>
+{/if}
+
+	</td>
+</tr>
+</table>
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl b/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
index db9051058..2a9cf3f21 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
@@ -1,230 +1,230 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-<script language="Javascript" type="text/javascript">
-<!--
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	var total_secs;
-
-	function TimerDown(secs)
-	{
-		total_secs = secs;
-		CountDown();
-	}
-
-	function TimerDisplay(secs)
-	{
-		timer_min = Math.floor(secs / 60);
-		timer_sec = secs % 60;
-
-		if (timer_min < 10) timer_min = '0'+ timer_min;
-		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
-
-		return timer_min+':'+timer_sec;
-	}
-
-	function CountDown()
-	{
-		total_secs--;
-		if (total_secs >= 0)
-		{
-			document.fcounter.counter.value = TimerDisplay(total_secs);
-			down=setTimeout("CountDown()",1000);
-		}
-	}
-
-	function toggleBox(mybox1, mybox2)
-	{
-		if (document.all)
-		{
-			if (document.all.item(mybox1).style.display == "none")
-			{
-				document.all.item(mybox1).style.display = "";
-				document.all.item(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.all.item(mybox2).style.display = "";
-				document.all.item(mybox1).style.display = "none";
-			}
-		}
-		else
-		{
-			if (document.getElementById(mybox1).style.display == "none")
-			{
-				document.getElementById(mybox1).style.display = "";
-				document.getElementById(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.getElementById(mybox2).style.display = "";
-				document.getElementById(mybox1).style.display = "none";
-			}
-		}
-	}
-
-//-->
-</script>
-{/literal}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="10">
-<tr>
-	<td align="left" valign="top" width="150px">
-
-{if $tool_domain_selected && $tool_frame_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Refresh</th>
-		</tr>
-		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
-		<tr>
-			<td>
-				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
-{section name=refresh loop=$tool_refresh_list}
-					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-{if $tool_refresh_rate > 0}
-		<tr>
-			<td>
-				<input type="text" name="counter" value="" readonly class="refresh_counter">
-				<script language="Javascript" type="text/javascript">
-					<!--
-					TimerDown({$tool_refresh_rate});
-					-->
-				</script>
-			</td>
-		</tr>
-{/if}
-		</form>
-		</table>
-		<br>
-{/if}
-
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Domains</th>
-		</tr>
-{section name=domain loop=$tool_domain_list}
-		<tr>
-			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{if $tool_domain_selected}
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Time Frame</th>
-		</tr>
-{section name=frame loop=$tool_frame_list}
-		<tr>
-			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&lowframe={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{/if}
-
-	</td>
-
-	<td width="10px">&nbsp;</td>
-
-	<td align="right" valign="top">
-
-{if $tool_domain_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
-		</tr>
-		</table>
-{elseif !$tool_domain_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a domain.</td>
-		</tr>
-		</table>
-{elseif !$tool_frame_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a time frame.</td>
-		</tr>
-		</table>
-{else}
-{if $tool_as_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
-		</tr>
-		</table>
-		<br>
-{/if}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0" width="100%" valign="top">
-{if $tool_rrd_output}
-{section name=rrd loop=$tool_rrd_output}
-				<b>{$tool_rrd_output[rrd].desc}</b><br>
-				<img src="{$tool_rrd_output[rrd].img}" border="0"><br>
-{/section}
-{/if}
-			</td>
-		</tr>
-		</table>
-{/if}
-
-	</td>
-</tr>
-</table>
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+<script language="Javascript" type="text/javascript">
+<!--
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	var total_secs;
+
+	function TimerDown(secs)
+	{
+		total_secs = secs;
+		CountDown();
+	}
+
+	function TimerDisplay(secs)
+	{
+		timer_min = Math.floor(secs / 60);
+		timer_sec = secs % 60;
+
+		if (timer_min < 10) timer_min = '0'+ timer_min;
+		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
+
+		return timer_min+':'+timer_sec;
+	}
+
+	function CountDown()
+	{
+		total_secs--;
+		if (total_secs >= 0)
+		{
+			document.fcounter.counter.value = TimerDisplay(total_secs);
+			down=setTimeout("CountDown()",1000);
+		}
+	}
+
+	function toggleBox(mybox1, mybox2)
+	{
+		if (document.all)
+		{
+			if (document.all.item(mybox1).style.display == "none")
+			{
+				document.all.item(mybox1).style.display = "";
+				document.all.item(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.all.item(mybox2).style.display = "";
+				document.all.item(mybox1).style.display = "none";
+			}
+		}
+		else
+		{
+			if (document.getElementById(mybox1).style.display == "none")
+			{
+				document.getElementById(mybox1).style.display = "";
+				document.getElementById(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.getElementById(mybox2).style.display = "";
+				document.getElementById(mybox1).style.display = "none";
+			}
+		}
+	}
+
+//-->
+</script>
+{/literal}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="10">
+<tr>
+	<td align="left" valign="top" width="150px">
+
+{if $tool_domain_selected && $tool_frame_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Refresh</th>
+		</tr>
+		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
+		<tr>
+			<td>
+				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
+{section name=refresh loop=$tool_refresh_list}
+					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+{if $tool_refresh_rate > 0}
+		<tr>
+			<td>
+				<input type="text" name="counter" value="" readonly class="refresh_counter">
+				<script language="Javascript" type="text/javascript">
+					<!--
+					TimerDown({$tool_refresh_rate});
+					-->
+				</script>
+			</td>
+		</tr>
+{/if}
+		</form>
+		</table>
+		<br>
+{/if}
+
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Domains</th>
+		</tr>
+{section name=domain loop=$tool_domain_list}
+		<tr>
+			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{if $tool_domain_selected}
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Time Frame</th>
+		</tr>
+{section name=frame loop=$tool_frame_list}
+		<tr>
+			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&lowframe={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{/if}
+
+	</td>
+
+	<td width="10px">&nbsp;</td>
+
+	<td align="right" valign="top">
+
+{if $tool_domain_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
+		</tr>
+		</table>
+{elseif !$tool_domain_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a domain.</td>
+		</tr>
+		</table>
+{elseif !$tool_frame_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a time frame.</td>
+		</tr>
+		</table>
+{else}
+{if $tool_as_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
+		</tr>
+		</table>
+		<br>
+{/if}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0" width="100%" valign="top">
+{if $tool_rrd_output}
+{section name=rrd loop=$tool_rrd_output}
+				<b>{$tool_rrd_output[rrd].desc}</b><br>
+				<img src="{$tool_rrd_output[rrd].img}" border="0"><br>
+{/section}
+{/if}
+			</td>
+		</tr>
+		</table>
+{/if}
+
+	</td>
+</tr>
+</table>
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl b/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
index 67288ac95..54d784934 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
@@ -1,252 +1,252 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-<script language="Javascript" type="text/javascript">
-<!--
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	var total_secs;
-
-	function TimerDown(secs)
-	{
-		total_secs = secs;
-		CountDown();
-	}
-
-	function TimerDisplay(secs)
-	{
-		timer_min = Math.floor(secs / 60);
-		timer_sec = secs % 60;
-
-		if (timer_min < 10) timer_min = '0'+ timer_min;
-		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
-
-		return timer_min+':'+timer_sec;
-	}
-
-	function CountDown()
-	{
-		total_secs--;
-		if (total_secs >= 0)
-		{
-			document.fcounter.counter.value = TimerDisplay(total_secs);
-			down=setTimeout("CountDown()",1000);
-		}
-	}
-
-	function toggleBox(mybox1, mybox2)
-	{
-		if (document.all)
-		{
-			if (document.all.item(mybox1).style.display == "none")
-			{
-				document.all.item(mybox1).style.display = "";
-				document.all.item(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.all.item(mybox2).style.display = "";
-				document.all.item(mybox1).style.display = "none";
-			}
-		}
-		else
-		{
-			if (document.getElementById(mybox1).style.display == "none")
-			{
-				document.getElementById(mybox1).style.display = "";
-				document.getElementById(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.getElementById(mybox2).style.display = "";
-				document.getElementById(mybox1).style.display = "none";
-			}
-		}
-	}
-
-//-->
-</script>
-{/literal}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="10">
-<tr>
-	<td align="left" valign="top" width="150px">
-
-{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Refresh</th>
-		</tr>
-		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
-		<tr>
-			<td>
-				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
-{section name=refresh loop=$tool_refresh_list}
-					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-{if $tool_refresh_rate > 0}
-		<tr>
-			<td>
-				<input type="text" name="counter" value="" readonly class="refresh_counter">
-				<script language="Javascript" type="text/javascript">
-					<!--
-					TimerDown({$tool_refresh_rate});
-					-->
-				</script>
-			</td>
-		</tr>
-{/if}
-		</form>
-		</table>
-		<br>
-{/if}
-
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Domains</th>
-		</tr>
-{section name=domain loop=$tool_domain_list}
-		<tr>
-			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{if $tool_domain_selected}
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Shards</th>
-		</tr>
-{section name=shard loop=$tool_shard_list}
-{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
-		<tr>
-			<td align="center" class="{if $tool_shard_selected == $tool_shard_list[shard].shard_id}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
-		</tr>
-{/if}
-{/section}
-		</table>
-
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Time Frame</th>
-		</tr>
-{section name=frame loop=$tool_frame_list}
-		<tr>
-			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&highframe={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{/if}
-
-	</td>
-
-	<td width="10px">&nbsp;</td>
-
-	<td align="right" valign="top">
-
-{if $tool_domain_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
-		</tr>
-		</table>
-{elseif !$tool_domain_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a domain.</td>
-		</tr>
-		</table>
-{elseif !$tool_shard_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a shard.</td>
-		</tr>
-		</table>
-{elseif !$tool_frame_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a time frame.</td>
-		</tr>
-		</table>
-{else}
-{if $tool_as_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
-		</tr>
-		</table>
-		<br>
-{/if}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0" width="100%" valign="top">
-{if $tool_rrd_high_output}
-{section name=rrd loop=$tool_rrd_high_output}
-				<b>{$tool_rrd_high_output[rrd].desc}</b><br>
-{if $tool_rrd_high_output[rrd].img != ''}
-				<img src="{$tool_rrd_high_output[rrd].img}" border="0"><br>
-{/if}
-{/section}
-{/if}
-			</td>
-		</tr>
-		</table>
-{/if}
-
-	</td>
-</tr>
-</table>
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+<script language="Javascript" type="text/javascript">
+<!--
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	var total_secs;
+
+	function TimerDown(secs)
+	{
+		total_secs = secs;
+		CountDown();
+	}
+
+	function TimerDisplay(secs)
+	{
+		timer_min = Math.floor(secs / 60);
+		timer_sec = secs % 60;
+
+		if (timer_min < 10) timer_min = '0'+ timer_min;
+		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
+
+		return timer_min+':'+timer_sec;
+	}
+
+	function CountDown()
+	{
+		total_secs--;
+		if (total_secs >= 0)
+		{
+			document.fcounter.counter.value = TimerDisplay(total_secs);
+			down=setTimeout("CountDown()",1000);
+		}
+	}
+
+	function toggleBox(mybox1, mybox2)
+	{
+		if (document.all)
+		{
+			if (document.all.item(mybox1).style.display == "none")
+			{
+				document.all.item(mybox1).style.display = "";
+				document.all.item(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.all.item(mybox2).style.display = "";
+				document.all.item(mybox1).style.display = "none";
+			}
+		}
+		else
+		{
+			if (document.getElementById(mybox1).style.display == "none")
+			{
+				document.getElementById(mybox1).style.display = "";
+				document.getElementById(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.getElementById(mybox2).style.display = "";
+				document.getElementById(mybox1).style.display = "none";
+			}
+		}
+	}
+
+//-->
+</script>
+{/literal}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="10">
+<tr>
+	<td align="left" valign="top" width="150px">
+
+{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Refresh</th>
+		</tr>
+		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
+		<tr>
+			<td>
+				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
+{section name=refresh loop=$tool_refresh_list}
+					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+{if $tool_refresh_rate > 0}
+		<tr>
+			<td>
+				<input type="text" name="counter" value="" readonly class="refresh_counter">
+				<script language="Javascript" type="text/javascript">
+					<!--
+					TimerDown({$tool_refresh_rate});
+					-->
+				</script>
+			</td>
+		</tr>
+{/if}
+		</form>
+		</table>
+		<br>
+{/if}
+
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Domains</th>
+		</tr>
+{section name=domain loop=$tool_domain_list}
+		<tr>
+			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{if $tool_domain_selected}
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Shards</th>
+		</tr>
+{section name=shard loop=$tool_shard_list}
+{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
+		<tr>
+			<td align="center" class="{if $tool_shard_selected == $tool_shard_list[shard].shard_id}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
+		</tr>
+{/if}
+{/section}
+		</table>
+
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Time Frame</th>
+		</tr>
+{section name=frame loop=$tool_frame_list}
+		<tr>
+			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&highframe={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{/if}
+
+	</td>
+
+	<td width="10px">&nbsp;</td>
+
+	<td align="right" valign="top">
+
+{if $tool_domain_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
+		</tr>
+		</table>
+{elseif !$tool_domain_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a domain.</td>
+		</tr>
+		</table>
+{elseif !$tool_shard_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a shard.</td>
+		</tr>
+		</table>
+{elseif !$tool_frame_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a time frame.</td>
+		</tr>
+		</table>
+{else}
+{if $tool_as_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
+		</tr>
+		</table>
+		<br>
+{/if}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0" width="100%" valign="top">
+{if $tool_rrd_high_output}
+{section name=rrd loop=$tool_rrd_high_output}
+				<b>{$tool_rrd_high_output[rrd].desc}</b><br>
+{if $tool_rrd_high_output[rrd].img != ''}
+				<img src="{$tool_rrd_high_output[rrd].img}" border="0"><br>
+{/if}
+{/section}
+{/if}
+			</td>
+		</tr>
+		</table>
+{/if}
+
+	</td>
+</tr>
+</table>
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl b/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
index c1c96d189..79299b7ab 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
@@ -1,250 +1,250 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-<script language="Javascript" type="text/javascript">
-<!--
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	function CheckAll()
-	{
-		for (var i=0; i<document.qlist.elements.length; i++)
-		{
-			var e = document.qlist.elements[i];
-			if (e.type == 'checkbox' && e.name != 'allbox')
-				e.checked = document.qlist.allbox.checked;
-		}
-	}
-
-	function CheckToggle(checkname)
-	{
-		checkname.checked = !checkname.checked;
-	}
-
-	var total_secs;
-
-	function TimerDown(secs)
-	{
-		total_secs = secs;
-		CountDown();
-	}
-
-	function TimerDisplay(secs)
-	{
-		timer_min = Math.floor(secs / 60);
-		timer_sec = secs % 60;
-
-		if (timer_min < 10) timer_min = '0'+ timer_min;
-		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
-
-		return timer_min+':'+timer_sec;
-	}
-
-	function CountDown()
-	{
-		total_secs--;
-		if (total_secs >= 0)
-		{
-			document.fcounter.counter.value = TimerDisplay(total_secs);
-			down=setTimeout("CountDown()",1000);
-		}
-	}
-
-	function toggleBox(mybox1, mybox2)
-	{
-		if (document.all)
-		{
-			if (document.all.item(mybox1).style.display == "none")
-			{
-				document.all.item(mybox1).style.display = "";
-				document.all.item(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.all.item(mybox2).style.display = "";
-				document.all.item(mybox1).style.display = "none";
-			}
-		}
-		else
-		{
-			if (document.getElementById(mybox1).style.display == "none")
-			{
-				document.getElementById(mybox1).style.display = "";
-				document.getElementById(mybox2).style.display = "none";
-			}
-			else
-			{
-				document.getElementById(mybox2).style.display = "";
-				document.getElementById(mybox1).style.display = "none";
-			}
-		}
-	}
-
-//-->
-</script>
-{/literal}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="right">
-			<table cellpadding="1" cellspacing="5" border="0">
-				<tr>
-					{section name=onemenu loop=$tool_menu}
-					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
-					{/section}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="10">
-<tr>
-	<td align="left" valign="top" width="150px">
-
-{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Refresh</th>
-		</tr>
-		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
-		<tr>
-			<td>
-				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
-{section name=refresh loop=$tool_refresh_list}
-					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
-{/section}
-				</select>
-			</td>
-		</tr>
-{if $tool_refresh_rate > 0}
-		<tr>
-			<td>
-				<input type="text" name="counter" value="" readonly class="refresh_counter">
-				<script language="Javascript" type="text/javascript">
-					<!--
-					TimerDown({$tool_refresh_rate});
-					-->
-				</script>
-			</td>
-		</tr>
-{/if}
-		</form>
-		</table>
-		<br>
-{/if}
-
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Domains</th>
-		</tr>
-{section name=domain loop=$tool_domain_list}
-		<tr>
-			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{if $tool_domain_selected}
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Shards</th>
-		</tr>
-{section name=shard loop=$tool_shard_list}
-{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
-		<tr>
-			<td align="center" class="{if $tool_shard_selected == $tool_shard_list[shard].shard_id}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
-		</tr>
-{/if}
-{/section}
-		</table>
-
-		<br>
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Time Frame</th>
-		</tr>
-{section name=frame loop=$tool_frame_list}
-		<tr>
-			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&lowframe={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
-		</tr>
-{/section}
-		</table>
-
-{/if}
-
-	</td>
-
-	<td width="10px">&nbsp;</td>
-
-	<td align="right" valign="top">
-
-{if $tool_domain_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
-		</tr>
-		</table>
-{elseif !$tool_domain_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a domain.</td>
-		</tr>
-		</table>
-{elseif !$tool_shard_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a shard.</td>
-		</tr>
-		</table>
-{elseif !$tool_frame_selected}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0">You need to select a time frame.</td>
-		</tr>
-		</table>
-{else}
-{if $tool_as_error}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
-		</tr>
-		</table>
-		<br>
-{/if}
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<td class="row0" width="100%" valign="top">
-{if $tool_rrd_output}
-{section name=rrd loop=$tool_rrd_output}
-				<b>{$tool_rrd_output[rrd].desc}</b><br>
-				<img src="{$tool_rrd_output[rrd].img}" border="0"><br>
-{/section}
-{/if}
-			</td>
-		</tr>
-		</table>
-{/if}
-
-	</td>
-</tr>
-</table>
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+<script language="Javascript" type="text/javascript">
+<!--
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	function CheckAll()
+	{
+		for (var i=0; i<document.qlist.elements.length; i++)
+		{
+			var e = document.qlist.elements[i];
+			if (e.type == 'checkbox' && e.name != 'allbox')
+				e.checked = document.qlist.allbox.checked;
+		}
+	}
+
+	function CheckToggle(checkname)
+	{
+		checkname.checked = !checkname.checked;
+	}
+
+	var total_secs;
+
+	function TimerDown(secs)
+	{
+		total_secs = secs;
+		CountDown();
+	}
+
+	function TimerDisplay(secs)
+	{
+		timer_min = Math.floor(secs / 60);
+		timer_sec = secs % 60;
+
+		if (timer_min < 10) timer_min = '0'+ timer_min;
+		if (timer_sec < 10) timer_sec = '0'+ timer_sec;
+
+		return timer_min+':'+timer_sec;
+	}
+
+	function CountDown()
+	{
+		total_secs--;
+		if (total_secs >= 0)
+		{
+			document.fcounter.counter.value = TimerDisplay(total_secs);
+			down=setTimeout("CountDown()",1000);
+		}
+	}
+
+	function toggleBox(mybox1, mybox2)
+	{
+		if (document.all)
+		{
+			if (document.all.item(mybox1).style.display == "none")
+			{
+				document.all.item(mybox1).style.display = "";
+				document.all.item(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.all.item(mybox2).style.display = "";
+				document.all.item(mybox1).style.display = "none";
+			}
+		}
+		else
+		{
+			if (document.getElementById(mybox1).style.display == "none")
+			{
+				document.getElementById(mybox1).style.display = "";
+				document.getElementById(mybox2).style.display = "none";
+			}
+			else
+			{
+				document.getElementById(mybox2).style.display = "";
+				document.getElementById(mybox1).style.display = "none";
+			}
+		}
+	}
+
+//-->
+</script>
+{/literal}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="right">
+			<table cellpadding="1" cellspacing="5" border="0">
+				<tr>
+					{section name=onemenu loop=$tool_menu}
+					<td height="22" class="boxed"><a href="{$tool_menu[onemenu].uri}">{$tool_menu[onemenu].title}</a></td>
+					{/section}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="10">
+<tr>
+	<td align="left" valign="top" width="150px">
+
+{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Refresh</th>
+		</tr>
+		<form action="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}" method="post" name="fcounter">
+		<tr>
+			<td>
+				<select name="services_refresh" style="width:100%;" onchange="this.form.submit();">
+{section name=refresh loop=$tool_refresh_list}
+					<option value="{$tool_refresh_list[refresh].secs}" {if $tool_refresh_rate == $tool_refresh_list[refresh].secs}selected{/if}>{$tool_refresh_list[refresh].desc}</option>
+{/section}
+				</select>
+			</td>
+		</tr>
+{if $tool_refresh_rate > 0}
+		<tr>
+			<td>
+				<input type="text" name="counter" value="" readonly class="refresh_counter">
+				<script language="Javascript" type="text/javascript">
+					<!--
+					TimerDown({$tool_refresh_rate});
+					-->
+				</script>
+			</td>
+		</tr>
+{/if}
+		</form>
+		</table>
+		<br>
+{/if}
+
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Domains</th>
+		</tr>
+{section name=domain loop=$tool_domain_list}
+		<tr>
+			<td align="center" class="{if $tool_domain_selected == $tool_domain_list[domain].domain_id}domainlistselected{else}domainlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_list[domain].domain_id}">{$tool_domain_list[domain].domain_name}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{if $tool_domain_selected}
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Shards</th>
+		</tr>
+{section name=shard loop=$tool_shard_list}
+{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
+		<tr>
+			<td align="center" class="{if $tool_shard_selected == $tool_shard_list[shard].shard_id}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_list[shard].shard_id}">{$tool_shard_list[shard].shard_name}</a></td>
+		</tr>
+{/if}
+{/section}
+		</table>
+
+		<br>
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Time Frame</th>
+		</tr>
+{section name=frame loop=$tool_frame_list}
+		<tr>
+			<td align="center" class="{if $tool_frame_selected == $tool_frame_list[frame].value}shardlistselected{else}shardlist{/if}"><a href="tool_graphs.php?toolmode={$toolmode}&domain={$tool_domain_selected}&shard={$tool_shard_selected}&lowframe={$tool_frame_list[frame].value}">{$tool_frame_list[frame].title}</a></td>
+		</tr>
+{/section}
+		</table>
+
+{/if}
+
+	</td>
+
+	<td width="10px">&nbsp;</td>
+
+	<td align="right" valign="top">
+
+{if $tool_domain_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_domain_error}</span></td>
+		</tr>
+		</table>
+{elseif !$tool_domain_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a domain.</td>
+		</tr>
+		</table>
+{elseif !$tool_shard_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a shard.</td>
+		</tr>
+		</table>
+{elseif !$tool_frame_selected}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0">You need to select a time frame.</td>
+		</tr>
+		</table>
+{else}
+{if $tool_as_error}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0"><span class="alert">{$tool_as_error}</span></td>
+		</tr>
+		</table>
+		<br>
+{/if}
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<td class="row0" width="100%" valign="top">
+{if $tool_rrd_output}
+{section name=rrd loop=$tool_rrd_output}
+				<b>{$tool_rrd_output[rrd].desc}</b><br>
+				<img src="{$tool_rrd_output[rrd].img}" border="0"><br>
+{/section}
+{/if}
+			</td>
+		</tr>
+		</table>
+{/if}
+
+	</td>
+</tr>
+</table>
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_notes.tpl b/code/web/public_php/admin/templates/default/tool_notes.tpl
index 56a35c4cf..e0e04106d 100644
--- a/code/web/public_php/admin/templates/default/tool_notes.tpl
+++ b/code/web/public_php/admin/templates/default/tool_notes.tpl
@@ -1,164 +1,164 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-
-<script language="Javascript" type="text/javascript">
-<!--
-
-	function toggleLine(myline)
-	{
-		if (document.all)
-		{
-			if (document.all.item(myline).style.display == "none")
-			{
-				document.all.item(myline).style.display = "";
-			}
-			else
-			{
-				document.all.item(myline).style.display = "none";
-			}
-		}
-		else
-		{
-			if (document.getElementById(myline).style.display == "none")
-			{
-				document.getElementById(myline).style.display = "";
-			}
-			else
-			{
-				document.getElementById(myline).style.display = "none";
-			}
-		}
-	}
-
-//-->
-</script>
-
-{/literal}
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-	<tr>
-		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
-	</tr>
-</table>
-
-<br>
-
-<table width="100%" border="0" cellpadding="0">
-<tr>
-	<td align="left" valign="top" width="50%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<tr>
-			<th colspan="10">Notes</th>
-		</tr>
-		<tr>
-			<td><b>ID</b></td>
-			<td><b>Title</b></td>
-			<td><b>Mode</b></td>
-			<td><b>Last Update</b></td>
-			<td><b>Active</b></td>
-{if $restriction_tool_notes_global}
-			<td><b>Global</b></td>
-{/if}
-		</tr>
-		{section name=note loop=$tool_note_list}
-		<tr class="{cycle values="row1,row0"}">
-			<td>{$tool_note_list[note].note_id}</td>
-			<td><a href="tool_notes.php?note_id={$tool_note_list[note].note_id}">{$tool_note_list[note].note_title}</a></td>
-			<td>{if $tool_note_list[note].note_mode  == 0}Text{else}Popup{/if}</td>
-			<td>{$tool_note_list[note].note_date|date_format:"%Y/%m/%d %H:%M:%S"}</td>
-			<td>{if $tool_note_list[note].note_active  == 1}Yes{else}No{/if}</td>
-{if $restriction_tool_notes_global}
-			<td>{if $tool_note_list[note].note_global  == 1}Yes{else}No{/if}</td>
-{/if}
-		</tr>
-		{/section}
-		</table>
-	</td>
-
-	<td>&nbsp;</td>
-
-	<td align="right" valign="top" width="50%">
-		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
-		<form action="tool_notes.php" method="post">
-		<tr>
-			<th colspan="10">Notes Details</th>
-		</tr>
-{if $tool_note_edit_data.note_id}
-		<tr>
-			<td align="right">Id :</td>
-			<td><input type="text" name="tool_form_note_id" value="{$tool_note_edit_data.note_id}" size="10" readonly></td>
-		</tr>
-{/if}
-		<tr>
-			<td align="right">Title :</td>
-			<td><input type="text" name="tool_form_note_title" value="{$tool_note_edit_data.note_title}" maxlength="64" size="100%"></td>
-		</tr>
-
-		<tr>
-			<td align="right">Mode : </td>
-			<td><select name="tool_form_note_mode" onchange="toggleLine('note_mode_text'); toggleLine('note_mode_popup_uri'); toggleLine('note_mode_popup_restriction');">
-				<option value="text" {if $tool_note_edit_data.note_mode == 0}selected{/if}>Text</option>
-				<option value="popup" {if $tool_note_edit_data.note_mode == 1}selected{/if}>Popup</option>
-			</select></td>
-		</tr>
-
-		<tr id="note_mode_text" name="note_mode_text" {if $tool_note_edit_data.note_mode == 1}style="display: none;"{/if}>
-			<td align="right">Text :</td>
-			<td><textarea name="tool_form_note_data" rows="15">{$tool_note_edit_data.note_data}</textarea></td>
-		</tr>
-
-		<tr id="note_mode_popup_uri" name="note_mode_popup_uri" {if $tool_note_edit_data.note_mode == 0}style="display: none;"{/if}>
-			<td align="right">URI :</td>
-			<td><input type="text" name="tool_form_note_popup_uri" value="{$tool_note_edit_data.note_popup_uri}" maxlength="255" size="100%"></td>
-		</tr>
-
-		<tr id="note_mode_popup_restriction" name="note_mode_popup_restriction" {if $tool_note_edit_data.note_mode == 0}style="display: none;"{/if}>
-			<td align="right">Restriction :</td>
-			<td><input type="text" name="tool_form_note_popup_restriction" value="{$tool_note_edit_data.note_popup_restriction}" maxlength="64" size="100%"></td>
-		</tr>
-
-		<tr>
-			<td align="right">Active :</td>
-			<td>
-				<select name="tool_form_note_active">
-					<option value="1" {if $tool_note_edit_data.note_active == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_note_edit_data.note_active == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-{if $restriction_tool_notes_global}
-		<tr>
-			<td align="right">Global :</td>
-			<td>
-				<select name="tool_form_note_global">
-					<option value="1" {if $tool_note_edit_data.note_global == 1}selected{/if}>Yes</option>
-					<option value="0" {if $tool_note_edit_data.note_global == 0}selected{/if}>No</option>
-				</select>
-			</td>
-		</tr>
-{/if}
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-
-{if $tool_note_edit_data.note_id}
-				<input type="submit" name="toolaction" value="update">
-				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE this note ?')) return true; return false;">
-{else}
-				<input type="submit" name="toolaction" value="create">
-
-{/if}
-
-			</td>
-		</tr>
-		</form>
-		</table>
-	</td>
-
-</tr>
-</table>
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+
+<script language="Javascript" type="text/javascript">
+<!--
+
+	function toggleLine(myline)
+	{
+		if (document.all)
+		{
+			if (document.all.item(myline).style.display == "none")
+			{
+				document.all.item(myline).style.display = "";
+			}
+			else
+			{
+				document.all.item(myline).style.display = "none";
+			}
+		}
+		else
+		{
+			if (document.getElementById(myline).style.display == "none")
+			{
+				document.getElementById(myline).style.display = "";
+			}
+			else
+			{
+				document.getElementById(myline).style.display = "none";
+			}
+		}
+	}
+
+//-->
+</script>
+
+{/literal}
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+	<tr>
+		<td align="left" valign="center"><span class="alert">{$tool_alert_message}</span></td>
+	</tr>
+</table>
+
+<br>
+
+<table width="100%" border="0" cellpadding="0">
+<tr>
+	<td align="left" valign="top" width="50%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<tr>
+			<th colspan="10">Notes</th>
+		</tr>
+		<tr>
+			<td><b>ID</b></td>
+			<td><b>Title</b></td>
+			<td><b>Mode</b></td>
+			<td><b>Last Update</b></td>
+			<td><b>Active</b></td>
+{if $restriction_tool_notes_global}
+			<td><b>Global</b></td>
+{/if}
+		</tr>
+		{section name=note loop=$tool_note_list}
+		<tr class="{cycle values="row1,row0"}">
+			<td>{$tool_note_list[note].note_id}</td>
+			<td><a href="tool_notes.php?note_id={$tool_note_list[note].note_id}">{$tool_note_list[note].note_title}</a></td>
+			<td>{if $tool_note_list[note].note_mode  == 0}Text{else}Popup{/if}</td>
+			<td>{$tool_note_list[note].note_date|date_format:"%Y/%m/%d %H:%M:%S"}</td>
+			<td>{if $tool_note_list[note].note_active  == 1}Yes{else}No{/if}</td>
+{if $restriction_tool_notes_global}
+			<td>{if $tool_note_list[note].note_global  == 1}Yes{else}No{/if}</td>
+{/if}
+		</tr>
+		{/section}
+		</table>
+	</td>
+
+	<td>&nbsp;</td>
+
+	<td align="right" valign="top" width="50%">
+		<table width="100%" border="0" cellpadding="1" bgcolor="#cccccc" class="view">
+		<form action="tool_notes.php" method="post">
+		<tr>
+			<th colspan="10">Notes Details</th>
+		</tr>
+{if $tool_note_edit_data.note_id}
+		<tr>
+			<td align="right">Id :</td>
+			<td><input type="text" name="tool_form_note_id" value="{$tool_note_edit_data.note_id}" size="10" readonly></td>
+		</tr>
+{/if}
+		<tr>
+			<td align="right">Title :</td>
+			<td><input type="text" name="tool_form_note_title" value="{$tool_note_edit_data.note_title}" maxlength="64" size="100%"></td>
+		</tr>
+
+		<tr>
+			<td align="right">Mode : </td>
+			<td><select name="tool_form_note_mode" onchange="toggleLine('note_mode_text'); toggleLine('note_mode_popup_uri'); toggleLine('note_mode_popup_restriction');">
+				<option value="text" {if $tool_note_edit_data.note_mode == 0}selected{/if}>Text</option>
+				<option value="popup" {if $tool_note_edit_data.note_mode == 1}selected{/if}>Popup</option>
+			</select></td>
+		</tr>
+
+		<tr id="note_mode_text" name="note_mode_text" {if $tool_note_edit_data.note_mode == 1}style="display: none;"{/if}>
+			<td align="right">Text :</td>
+			<td><textarea name="tool_form_note_data" rows="15">{$tool_note_edit_data.note_data}</textarea></td>
+		</tr>
+
+		<tr id="note_mode_popup_uri" name="note_mode_popup_uri" {if $tool_note_edit_data.note_mode == 0}style="display: none;"{/if}>
+			<td align="right">URI :</td>
+			<td><input type="text" name="tool_form_note_popup_uri" value="{$tool_note_edit_data.note_popup_uri}" maxlength="255" size="100%"></td>
+		</tr>
+
+		<tr id="note_mode_popup_restriction" name="note_mode_popup_restriction" {if $tool_note_edit_data.note_mode == 0}style="display: none;"{/if}>
+			<td align="right">Restriction :</td>
+			<td><input type="text" name="tool_form_note_popup_restriction" value="{$tool_note_edit_data.note_popup_restriction}" maxlength="64" size="100%"></td>
+		</tr>
+
+		<tr>
+			<td align="right">Active :</td>
+			<td>
+				<select name="tool_form_note_active">
+					<option value="1" {if $tool_note_edit_data.note_active == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_note_edit_data.note_active == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+{if $restriction_tool_notes_global}
+		<tr>
+			<td align="right">Global :</td>
+			<td>
+				<select name="tool_form_note_global">
+					<option value="1" {if $tool_note_edit_data.note_global == 1}selected{/if}>Yes</option>
+					<option value="0" {if $tool_note_edit_data.note_global == 0}selected{/if}>No</option>
+				</select>
+			</td>
+		</tr>
+{/if}
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+
+{if $tool_note_edit_data.note_id}
+				<input type="submit" name="toolaction" value="update">
+				<input type="submit" name="toolaction" value="delete" onclick="if (confirm('Are you sure you want to DELETE this note ?')) return true; return false;">
+{else}
+				<input type="submit" name="toolaction" value="create">
+
+{/if}
+
+			</td>
+		</tr>
+		</form>
+		</table>
+	</td>
+
+</tr>
+</table>
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/ams/templates/forgot_password.tpl b/code/web/public_php/ams/templates/forgot_password.tpl
index 80bea346b..f6fae04d1 100644
--- a/code/web/public_php/ams/templates/forgot_password.tpl
+++ b/code/web/public_php/ams/templates/forgot_password.tpl
@@ -1,54 +1,54 @@
-{extends file="layout.tpl"}
-{block name=content}
-
-<div class="row-fluid">
-	<div class="span12 center login-header">
-		<a href="?"><img src="img/mainlogo.png"/></a> 
-	</div><!--/span-->
-</div><!--/row-->
-
-<div class="row-fluid">
-	<div class="well span5 center login-box">
-		<div class="alert alert-info">
-			 {$forgot_password_message}
-		</div>
-		<form id="signup" class="form-vertical" method="post" action="index.php">
-			<legend>{$title}</legend>
-			
-			<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}error{/if}">
-			<label class="control-label">{$email_tag}</label>
-				<div class="controls">
-				    <div class="input-prepend">
-					<span class="add-on"><span class="icon-envelope"></span></span>
-						<input type="text" class="input-xlarge" id="Email" name="Email" placeholder="{$email_default}" {if isset($prevEmail)}value="{$prevEmail}"{/if} rel="popover" data-content="{$email_tooltip}" data-original-title="{$email_default}">
-					</div>
-				</div>
-			</div>
-			
-			{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
-			<div class="alert alert-error">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				{$email_doesnt_exist}
-			</div>
-			{/if}
-			{if isset($EMAIL_SUCCESS) and $EMAIL_SUCCESS eq "TRUE"}
-			<div class="alert alert-success">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				{$email_sent}
-			</div>
-			{/if}
-			<input type="hidden" name="function" value="forgot_password">		
-			<p class="center span5">
-				<button type="submit" class="btn btn-primary" >Send me the reset link</button>
-			</p>
-	
-		</form>
-		<div class="alert alert-info">
-			{$register_message} <a href="?page=register">{$here}</a>.<br/> {$login_message} <a href="?page=login">{$here}</a>
-		</div>
-
-	</div><!--/span-->
-</div><!--/row-->
-{/block}
-
-	
+{extends file="layout.tpl"}
+{block name=content}
+
+<div class="row-fluid">
+	<div class="span12 center login-header">
+		<a href="?"><img src="img/mainlogo.png"/></a> 
+	</div><!--/span-->
+</div><!--/row-->
+
+<div class="row-fluid">
+	<div class="well span5 center login-box">
+		<div class="alert alert-info">
+			 {$forgot_password_message}
+		</div>
+		<form id="signup" class="form-vertical" method="post" action="index.php">
+			<legend>{$title}</legend>
+			
+			<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}error{/if}">
+			<label class="control-label">{$email_tag}</label>
+				<div class="controls">
+				    <div class="input-prepend">
+					<span class="add-on"><span class="icon-envelope"></span></span>
+						<input type="text" class="input-xlarge" id="Email" name="Email" placeholder="{$email_default}" {if isset($prevEmail)}value="{$prevEmail}"{/if} rel="popover" data-content="{$email_tooltip}" data-original-title="{$email_default}">
+					</div>
+				</div>
+			</div>
+			
+			{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				{$email_doesnt_exist}
+			</div>
+			{/if}
+			{if isset($EMAIL_SUCCESS) and $EMAIL_SUCCESS eq "TRUE"}
+			<div class="alert alert-success">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				{$email_sent}
+			</div>
+			{/if}
+			<input type="hidden" name="function" value="forgot_password">		
+			<p class="center span5">
+				<button type="submit" class="btn btn-primary" >Send me the reset link</button>
+			</p>
+	
+		</form>
+		<div class="alert alert-info">
+			{$register_message} <a href="?page=register">{$here}</a>.<br/> {$login_message} <a href="?page=login">{$here}</a>
+		</div>
+
+	</div><!--/span-->
+</div><!--/row-->
+{/block}
+
+	
diff --git a/code/web/public_php/ams/templates/register.tpl b/code/web/public_php/ams/templates/register.tpl
index 24aac42a2..f14ef9a6c 100644
--- a/code/web/public_php/ams/templates/register.tpl
+++ b/code/web/public_php/ams/templates/register.tpl
@@ -1,124 +1,124 @@
-{extends file="layout.tpl"}
-{block name=content}
-
-<div class="row-fluid">
-	<div class="span12 center login-header">
-		<a href="?"><img src="img/mainlogo.png"/></a> 
-	</div><!--/span-->
-</div><!--/row-->
-
-<div class="row-fluid">
-	<div class="well span5 center login-box">
-		<div class="alert alert-info">
-			 {$welcome_message}
-		</div>
-		{if $userRegistration == '0'|| $userRegistration == '2'}
-		<form id="signup" class="form-vertical" method="post" action="index.php">
-			<legend>{$title}</legend>
-			
-			<div class="control-group {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}error{else if
-			isset($USERNAME) and $USERNAME eq "success"}success{else}{/if}">
-			<label class="control-label">{$username_tag}</label>
-				<div class="controls">
-				    <div class="input-prepend">
-					<span class="add-on"><span class="icon-user"></span></span>
-						<input type="text" class="input-xlarge" id="Username" name="Username" placeholder="{$username_default}" {if isset($prevUsername)}value="{$prevUsername}"{/if} rel="popover" data-content="{$username_tooltip}" data-original-title="{$username_default}">
-					</div>
-				</div>
-			</div>
-
-
-			<div class="control-group {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}error{else if
-			isset($PASSWORD) and $PASSWORD eq "success"}success{else}{/if}">
-			<label class="control-label">{$password_tag}</label>
-				<div class="controls">
-				    <div class="input-prepend">
-					<span class="add-on"><span class="icon-lock"></span></span>
-						<input type="Password" id="Password" class="input-xlarge" name="Password" placeholder="{$password_default}"  {if isset($prevPassword)}value="{$prevPassword}"{/if} rel="popover" data-content="{$password_tooltip}" data-original-title="{$password_default}">
-					</div>
-				</div>
-			</div>
-			
-			<div class="control-group {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($CPASSWORD) and $CPASSWORD eq "success"}success{else}{/if}">
-			<label class="control-label">{$cpassword_tag}</label>
-				<div class="controls">
-				    <div class="input-prepend">
-					<span class="add-on"><span class="icon-lock"></span></span>
-						<input type="Password" id="ConfirmPass" class="input-xlarge" name="ConfirmPass" placeholder="{$cpassword_default}"  {if isset($prevConfirmPass)}value="{$prevConfirmPass}"{/if} rel="popover" data-content="{$cpassword_tooltip}" data-original-title="{$cpassword_default}">
-					</div>
-				</div>
-			</div>
-			
-			<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}error{else if
-			isset($EMAIL) and $EMAIL eq "success"}success{else}{/if}">
-			<label class="control-label">{$email_tag}</label>
-				<div class="controls">
-				    <div class="input-prepend">
-					<span class="add-on"><span class="icon-envelope"></span></span>
-						<input type="text" class="input-xlarge" id="Email" name="Email" placeholder="{$email_default}" {if isset($prevEmail)}value="{$prevEmail}"{/if} rel="popover" data-content="{$email_tooltip}" data-original-title="{$email_default}">
-					</div>
-				</div>
-			</div>
-			
-			<div class="control-group {if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}error{else if
-			isset($TAC) and $TAC eq "success"}success{else}{/if}">
-				<div class="controls">
-				    <div class="input-prepend">
-						<input type="checkbox" class="input-xlarge" id="TaC" name="TaC" placeholder="Email">{$tac_tag1}<a href='{$TOS_URL}'>{$tac_tag2}</a>
-						
-					</div>
-				</div>
-			</div>
-			
-			{if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}
-			<div class="alert alert-error">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Username Error</strong> {$USERNAME}
-			</div>
-			{/if}
-			
-			{if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}
-			<div class="alert alert-error">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Password Error</strong> {$PASSWORD}
-			</div>
-			{/if}
-			
-			{if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE" and $CPASSWORD != ""}
-			<div class="alert alert-error">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Confirmation Password Error</strong> {$CPASSWORD}
-			</div>
-			{/if}
-			
-			{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
-			<div class="alert alert-error">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Email Error</strong> {$EMAIL}
-			</div>
-			{/if}
-			
-			{if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}
-			<div class="alert alert-error">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Terms of Service Error</strong> {$tac_message}
-			</div>
-			{/if}
-			
-			<input type="hidden" name="function" value="add_user">
-			<p class="center span5">
-				<button type="submit" class="btn btn-primary" >Create My Account</button>
-			</p>
-	
-		</form>
-		{else}
-			Registration Disabled!
-		{/if}
-
-
-	</div><!--/span-->
-</div><!--/row-->
-{/block}
-
-	
+{extends file="layout.tpl"}
+{block name=content}
+
+<div class="row-fluid">
+	<div class="span12 center login-header">
+		<a href="?"><img src="img/mainlogo.png"/></a> 
+	</div><!--/span-->
+</div><!--/row-->
+
+<div class="row-fluid">
+	<div class="well span5 center login-box">
+		<div class="alert alert-info">
+			 {$welcome_message}
+		</div>
+		{if $userRegistration == '0'|| $userRegistration == '2'}
+		<form id="signup" class="form-vertical" method="post" action="index.php">
+			<legend>{$title}</legend>
+			
+			<div class="control-group {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}error{else if
+			isset($USERNAME) and $USERNAME eq "success"}success{else}{/if}">
+			<label class="control-label">{$username_tag}</label>
+				<div class="controls">
+				    <div class="input-prepend">
+					<span class="add-on"><span class="icon-user"></span></span>
+						<input type="text" class="input-xlarge" id="Username" name="Username" placeholder="{$username_default}" {if isset($prevUsername)}value="{$prevUsername}"{/if} rel="popover" data-content="{$username_tooltip}" data-original-title="{$username_default}">
+					</div>
+				</div>
+			</div>
+
+
+			<div class="control-group {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}error{else if
+			isset($PASSWORD) and $PASSWORD eq "success"}success{else}{/if}">
+			<label class="control-label">{$password_tag}</label>
+				<div class="controls">
+				    <div class="input-prepend">
+					<span class="add-on"><span class="icon-lock"></span></span>
+						<input type="Password" id="Password" class="input-xlarge" name="Password" placeholder="{$password_default}"  {if isset($prevPassword)}value="{$prevPassword}"{/if} rel="popover" data-content="{$password_tooltip}" data-original-title="{$password_default}">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}error{else if
+			isset($CPASSWORD) and $CPASSWORD eq "success"}success{else}{/if}">
+			<label class="control-label">{$cpassword_tag}</label>
+				<div class="controls">
+				    <div class="input-prepend">
+					<span class="add-on"><span class="icon-lock"></span></span>
+						<input type="Password" id="ConfirmPass" class="input-xlarge" name="ConfirmPass" placeholder="{$cpassword_default}"  {if isset($prevConfirmPass)}value="{$prevConfirmPass}"{/if} rel="popover" data-content="{$cpassword_tooltip}" data-original-title="{$cpassword_default}">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}error{else if
+			isset($EMAIL) and $EMAIL eq "success"}success{else}{/if}">
+			<label class="control-label">{$email_tag}</label>
+				<div class="controls">
+				    <div class="input-prepend">
+					<span class="add-on"><span class="icon-envelope"></span></span>
+						<input type="text" class="input-xlarge" id="Email" name="Email" placeholder="{$email_default}" {if isset($prevEmail)}value="{$prevEmail}"{/if} rel="popover" data-content="{$email_tooltip}" data-original-title="{$email_default}">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group {if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}error{else if
+			isset($TAC) and $TAC eq "success"}success{else}{/if}">
+				<div class="controls">
+				    <div class="input-prepend">
+						<input type="checkbox" class="input-xlarge" id="TaC" name="TaC" placeholder="Email">{$tac_tag1}<a href='{$TOS_URL}'>{$tac_tag2}</a>
+						
+					</div>
+				</div>
+			</div>
+			
+			{if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Username Error</strong> {$USERNAME}
+			</div>
+			{/if}
+			
+			{if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Password Error</strong> {$PASSWORD}
+			</div>
+			{/if}
+			
+			{if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE" and $CPASSWORD != ""}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Confirmation Password Error</strong> {$CPASSWORD}
+			</div>
+			{/if}
+			
+			{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Email Error</strong> {$EMAIL}
+			</div>
+			{/if}
+			
+			{if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Terms of Service Error</strong> {$tac_message}
+			</div>
+			{/if}
+			
+			<input type="hidden" name="function" value="add_user">
+			<p class="center span5">
+				<button type="submit" class="btn btn-primary" >Create My Account</button>
+			</p>
+	
+		</form>
+		{else}
+			Registration Disabled!
+		{/if}
+
+
+	</div><!--/span-->
+</div><!--/row-->
+{/block}
+
+	
diff --git a/code/web/public_php/ams/templates/reset_password.tpl b/code/web/public_php/ams/templates/reset_password.tpl
index 4c5bca351..57d0567ff 100644
--- a/code/web/public_php/ams/templates/reset_password.tpl
+++ b/code/web/public_php/ams/templates/reset_password.tpl
@@ -1,66 +1,66 @@
-{extends file="layout.tpl"}
-{block name=content}
-
-<div class="row-fluid">
-	<div class="span12 center login-header">
-		<a href="?"><img src="img/mainlogo.png"/></a> 
-	</div><!--/span-->
-</div><!--/row-->
-
-<div class="row-fluid">
-	<div class="well span5 center login-box">
-
-		<form id="signup" class="form-vertical" method="post" action="index.php{$getstring}">
-			<legend>{$title}</legend>
-
-				<div class="control-group {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($newpass_error_message) and $newpass_error_message eq "success"}success{else}{/if}">
-				<label class="control-label">New Password</label>
-					<div class="controls">
-					    <div class="input-prepend">
-						<span class="add-on" style="margin-left:5px;"><span class="icon-tag"></span></span>
-							<input type="password" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
-							{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<br/><span class="help-inline">{$newpass_error_message}</span>{/if}
-					   </div>
-					</div>
-				</div>
-					
-				<div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
-				<label class="control-label">Confirm New Password</label>
-					<div class="controls">
-					    <div class="input-prepend">
-						<span class="add-on" style="margin-left:5px;"><span class="icon-tags"></span></span>
-							<input type="password" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
-							{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<br/><span class="help-inline">{$confirmnewpass_error_message}</span>{/if}
-					    </div>
-					</div>
-				</div>
-				
-				
-			
-				{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-				<div class="alert alert-success">
-					The password has been changed!
-				</div>
-				{/if}
-				
-				{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
-				<div class="alert alert-warning">
-					The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-				</div>
-				{/if}
-			
-			<input type="hidden" name="function" value="reset_password">
-			<p class="center span5">
-				<button type="submit" class="btn btn-primary" >Reset the password!</button>
-			</p>
-	
-		</form>
-
-
-	</div><!--/span-->
-</div><!--/row-->
-{/block}
-
-	
+{extends file="layout.tpl"}
+{block name=content}
+
+<div class="row-fluid">
+	<div class="span12 center login-header">
+		<a href="?"><img src="img/mainlogo.png"/></a> 
+	</div><!--/span-->
+</div><!--/row-->
+
+<div class="row-fluid">
+	<div class="well span5 center login-box">
+
+		<form id="signup" class="form-vertical" method="post" action="index.php{$getstring}">
+			<legend>{$title}</legend>
+
+				<div class="control-group {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}error{else if
+			isset($newpass_error_message) and $newpass_error_message eq "success"}success{else}{/if}">
+				<label class="control-label">New Password</label>
+					<div class="controls">
+					    <div class="input-prepend">
+						<span class="add-on" style="margin-left:5px;"><span class="icon-tag"></span></span>
+							<input type="password" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
+							{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<br/><span class="help-inline">{$newpass_error_message}</span>{/if}
+					   </div>
+					</div>
+				</div>
+					
+				<div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
+			isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
+				<label class="control-label">Confirm New Password</label>
+					<div class="controls">
+					    <div class="input-prepend">
+						<span class="add-on" style="margin-left:5px;"><span class="icon-tags"></span></span>
+							<input type="password" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
+							{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<br/><span class="help-inline">{$confirmnewpass_error_message}</span>{/if}
+					    </div>
+					</div>
+				</div>
+				
+				
+			
+				{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
+				<div class="alert alert-success">
+					The password has been changed!
+				</div>
+				{/if}
+				
+				{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
+				<div class="alert alert-warning">
+					The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
+				</div>
+				{/if}
+			
+			<input type="hidden" name="function" value="reset_password">
+			<p class="center span5">
+				<button type="submit" class="btn btn-primary" >Reset the password!</button>
+			</p>
+	
+		</form>
+
+
+	</div><!--/span-->
+</div><!--/row-->
+{/block}
+
+	
diff --git a/code/web/public_php/ams/templates/settings.tpl b/code/web/public_php/ams/templates/settings.tpl
index 94883c9de..0e04cab17 100644
--- a/code/web/public_php/ams/templates/settings.tpl
+++ b/code/web/public_php/ams/templates/settings.tpl
@@ -1,382 +1,382 @@
-{block name=content}
-	<div class="row-fluid js-masonry" data-masonry-options='{ "itemSelector": ".js-masonry-item", "transitionDuration": 0 }'>
-		<div class="col-sm-4 js-masonry-item">
-		<div class="panel panel-default">
-			<div class="panel-heading" data-original-title="">
-				<span class="icon-th"></span> Change Password
-			</div>
-			<div class="panel-body">
-				<div class="row-fluid">
-					<form id="changePassword" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Change Password</legend>
-
-						{if !isset($changesOther) or $changesOther eq "FALSE"}
-							<div class="control-group {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}error{else if
-				isset($match_error_message) and $match_error_message neq "fail"}success{else}{/if}">
-							<label class="control-label">Current Password</label>
-								<div class="controls">
-								    <div class="input-prepend">
-									<span class="add-on" style="margin-left:5px;"><span class="icon-lock"></span></span>
-										<input type="password" class="setup-width" id="CurrentPass" name="CurrentPass" placeholder="Your current password" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
-										{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<span class="help-inline">The password is incorrect</span>{/if}
-								    </div>
-								</div>
-							</div>
-						{/if}
-							<div class="control-group {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($newpass_error_message) and $newpass_error_message eq "success"}success{else}{/if}">
-						<label class="control-label">New Password</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><span class="icon-tag"></span></span>
-									<input type="password" class="setup-width" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
-									{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$newpass_error_message}</span>{/if}
-							   </div>
-							</div>
-						</div>
-
-						<div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
-						<label class="control-label">Confirm New Password</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><span class="icon-tags"></span></span>
-									<input type="password" class="setup-width" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
-									{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$confirmnewpass_error_message}</span>{/if}
-							    </div>
-							</div>
-						</div>
-
-
-
-						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-						<div class="alert alert-success">
-							The password has been changed!
-						</div>
-						{/if}
-
-						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
-						<div class="alert alert-warning">
-							The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-						</div>
-						{/if}
-
-						<input type="hidden" name="function" value="change_password">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Password</button>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div>
-		</div><!--/span-->
-
-		{if $permission != '1'}
-		<div class="col-sm-4 js-masonry-item">
-		<div class="panel panel-default">
-			<div class="panel-heading" data-original-title="">
-				<span class="icon-th"></span> Add User
-			</div>
-			<div class="panel-body">
-				<div class="row-fluid">
-					<form id="addUser" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Add User</legend>
-
-						<div class="control-group {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}error{/if}">
-							<label class="control-label">Username</label>
-								<div class="controls">
-									<div class="input-prepend">
-									<span style="margin-left:5px;" class="add-on"><span class="icon-user"></span></span>
-										<input type="text" placeholder="Username" name="Username" id="Username" class="setup-width" {if isset($prevUsername)}value="{$prevUsername}"{/if}>
-										{if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}<span class="help-inline">{$USERNAME}</span>{/if}
-									</div>
-								</div>
-						</div>
-
-						<div class="control-group {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}error{/if}">
-							<label class="control-label">Password</label>
-								<div class="controls">
-								    <div class="input-prepend">
-										<span style="margin-left:5px;" class="add-on"><span class="icon-lock"></span></span>
-										<input type="password" placeholder="Password" name="Password" id="Password" class="setup-width">
-										{if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$PASSWORD}</span>{/if}
-									 </div>
-								</div>
-						</div>
-
-						<div class="control-group {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}error{/if}">
-							<label class="control-label">Confirm Password</label>
-								<div class="controls">
-								    <div class="input-prepend">
-										<span style="margin-left:5px;" class="add-on"><span class="icon-lock"></span></span>
-										<input type="password" placeholder="Confirm Password" name="ConfirmPass" id="ConfirmPass" class="setup-width">
-										{if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$CPASSWORD}</span>{/if}
-									 </div>
-								</div>
-						</div>
-
-						<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE" and isset($do)}error{/if}">
-						<label class="control-label">Email</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span style="margin-left:5px;" class="add-on"><span class="icon-envelope"></span></span>
-									<input type="text" class="setup-width" id="Email" name="Email" placeholder="Email" {if isset($prevEmail)}value="{$prevEmail}"{/if}>
-									{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE" and isset($do)}<span class="help-inline">{$EMAIL}</span>{/if}
-							    </div>
-							</div>
-						</div>
-
-
-						{if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "ok"}
-						<div class="alert alert-success">
-							The user has been created!
-						</div>
-						{/if}
-
-						{if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "shardoffline"}
-						<div class="alert alert-warning">
-							The user is created, though the shard seems offline, it may take some time to see the change on the shard.
-						</div>
-						{/if}
-
-						<input type="hidden" name="function" value="add_user">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Create User</button>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div>
-		</div><!--/span-->
-		{/if}
-
-		<div class="col-sm-4 js-masonry-item">
-		<div class="panel panel-default">
-			<div class="panel-heading" data-original-title="">
-				<span class="icon-th"></span> Change Email
-			</div>
-			<div class="panel-body">
-				<div class="row-fluid">
-					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Change Email</legend>
-						<div class="control-group {if isset($CEMAIL_ERROR) and $CEMAIL_ERROR eq "TRUE"}error{/if}">
-						<label class="control-label">New Email</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><span class="icon-envelope"></span></span>
-									<input type="text" class="setup-width" id="NewEmail" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
-									{if isset($CEMAIL_ERROR) and $CEMAIL_ERROR eq "TRUE"}<span class="help-inline">{$EMAIL}</span>{/if}
-
-							    </div>
-							</div>
-						</div>
-
-
-						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
-						<div class="alert alert-success">
-							The email has been changed!
-						</div>
-						{/if}
-
-						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "SHARDOFF"}
-						<div class="alert alert-warning">
-							The email has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-						</div>
-						{/if}
-
-						<input type="hidden" name="function" value="change_mail">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Email</button>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div>
-		</div>
-
-		<div class="col-sm-4 js-masonry-item">
-		<div class="panel panel-default">
-			<div class="panel-heading" data-original-title="">
-				<span class="icon-envelope"></span> Ticket updates
-			</div>
-
-
-			<div class="panel-body">
-				<div class="row-fluid">
-					<form id="changeReceiveMail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Ticket-Update Mail Settings</legend>
-
-						<div class="control-group">
-							<label class="control-label">Receive ticket updates</label>
-							<div class="controls">
-								 <select name="ReceiveMail">
-									<option value="1" {if isset($ReceiveMail) and $ReceiveMail eq 1}selected="selected"{/if}>Yes</option>
-									<option value="0" {if isset($ReceiveMail) and $ReceiveMail eq 0}selected="selected"{/if}>No</option>
-								</select>
-							</div>
-
-						</div>
-
-						<input type="hidden" name="function" value="change_receivemail">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Updates</button>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div>
-		</div><!--/span-->
-
-		<div class="col-sm-4 js-masonry-item">
-		<div class="panel panel-default">
-			<div class="panel-heading" data-original-title="">
-				<span class="icon-th"></span> Change Info
-			</div>
-			<div class="panel-body">
-				<div class="row-fluid">
-					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Change Info</legend>
-
-						<div class="control-group">
-						<label class="control-label">Firstname</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><span class="icon-user"></span></span>
-									<input type="text" class="setup-width" id="FirstName" name="FirstName" placeholder="Your firstname" {if isset($FirstName) and $FirstName neq ""}value="{$FirstName}"{/if}>
-								</div>
-							</div>
-						</div>
-
-						<div class="control-group">
-						<label class="control-label">Lastname</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><span class="icon-user"></span></span>
-									<input type="text" class="setup-width" id="LastName" name="LastName" placeholder="Your lastname" {if isset($LastName) and $LastName neq ""}value="{$LastName}"{/if}>
-								</div>
-							</div>
-						</div>
-
-						<div class="control-group">
-						<label class="control-label">Country</label>
-							<div class="controls">
-								 <select name="Country">
-									{foreach from=$country_array key=k item=v}
-										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
-									{/foreach}
-								</select>
-							</div>
-						</div>
-
-						<div class="control-group gender-list">
-							<label class="control-label">Gender</label>
-							<div class="controls">
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 0}checked{/if}"><input name="Gender" id="optionsRadios0" value="0" {if isset($Gender) and $Gender eq 0}checked=""{/if} type="radio"></span></div>
-								      Secret
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($Gender) and $Gender eq 1}checked{/if}"><input name="Gender" id="optionsRadios1" value="1" {if isset($Gender) and $Gender eq 1}checked=""{/if} type="radio"></span></div>
-									Male
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 2}checked{/if}"><input name="Gender" id="optionsRadios2" value="2" {if isset($Gender) and $Gender eq 2}checked=""{/if} type="radio"></span></div>
-								      Female
-								</label>
-							</div>
-						</div>
-
-						{if isset($info_updated) and $info_updated eq "OK"}
-						<div class="alert alert-success">
-							The Info has been updated!
-						</div>
-						{/if}
-
-						<input type="hidden" name="function" value="change_info">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Info</button>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div>
-		</div><!--/span-->
-		
-		{if $permission == '3'}
-		<div class="col-sm-4 js-masonry-item">
-		<div class="panel panel-default">
-			<div class="panel-heading" data-original-title="">
-				<span class="icon-th"></span> User Registration
-			</div>
-			<div class="panel-body">
-				<div class="row-fluid">
-					<form id="userRegistration" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>User Registration</legend>
-
-						<div class="control-group gender-list">
-							<div class="controls">
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 0}checked{/if}"><input name="userRegistration" id="optionsRadios0" value="0" {if isset($userRegistration) and $userRegistration eq 0}checked=""{/if} type="radio"></span></div>
-								      In-Game and Web Registration
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 1}checked{/if}"><input name="userRegistration" id="optionsRadios1" value="1" {if isset($userRegistration) and $userRegistration eq 1}checked=""{/if} type="radio"></span></div>
-									In-Game Registration Only
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 2}checked{/if}"><input name="userRegistration" id="optionsRadios2" value="2" {if isset($userRegistration) and $userRegistration eq 2}checked=""{/if} type="radio"></span></div>
-								      Web Registration Only
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 3}checked{/if}"><input name="userRegistration" id="optionsRadios2" value="3" {if isset($userRegistration) and $userRegistration eq 3}checked=""{/if} type="radio"></span></div>
-								      No Registration
-								</label>
-							</div>
-						</div>
-
-						<input type="hidden" name="function" value="userRegistration">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Setting</button>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div>
-		</div><!--/span-->
-		{/if}
-		
-	</div><!--/row-->
-
-	<script src="js/masonry.pkgd.min.js"></script>
-
-{/block}
-
+{block name=content}
+	<div class="row-fluid js-masonry" data-masonry-options='{ "itemSelector": ".js-masonry-item", "transitionDuration": 0 }'>
+		<div class="col-sm-4 js-masonry-item">
+		<div class="panel panel-default">
+			<div class="panel-heading" data-original-title="">
+				<span class="icon-th"></span> Change Password
+			</div>
+			<div class="panel-body">
+				<div class="row-fluid">
+					<form id="changePassword" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<legend>Change Password</legend>
+
+						{if !isset($changesOther) or $changesOther eq "FALSE"}
+							<div class="control-group {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}error{else if
+				isset($match_error_message) and $match_error_message neq "fail"}success{else}{/if}">
+							<label class="control-label">Current Password</label>
+								<div class="controls">
+								    <div class="input-prepend">
+									<span class="add-on" style="margin-left:5px;"><span class="icon-lock"></span></span>
+										<input type="password" class="setup-width" id="CurrentPass" name="CurrentPass" placeholder="Your current password" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
+										{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<span class="help-inline">The password is incorrect</span>{/if}
+								    </div>
+								</div>
+							</div>
+						{/if}
+							<div class="control-group {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}error{else if
+			isset($newpass_error_message) and $newpass_error_message eq "success"}success{else}{/if}">
+						<label class="control-label">New Password</label>
+							<div class="controls">
+							    <div class="input-prepend">
+								<span class="add-on" style="margin-left:5px;"><span class="icon-tag"></span></span>
+									<input type="password" class="setup-width" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
+									{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$newpass_error_message}</span>{/if}
+							   </div>
+							</div>
+						</div>
+
+						<div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
+			isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
+						<label class="control-label">Confirm New Password</label>
+							<div class="controls">
+							    <div class="input-prepend">
+								<span class="add-on" style="margin-left:5px;"><span class="icon-tags"></span></span>
+									<input type="password" class="setup-width" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
+									{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$confirmnewpass_error_message}</span>{/if}
+							    </div>
+							</div>
+						</div>
+
+
+
+						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
+						<div class="alert alert-success">
+							The password has been changed!
+						</div>
+						{/if}
+
+						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
+						<div class="alert alert-warning">
+							The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
+						</div>
+						{/if}
+
+						<input type="hidden" name="function" value="change_password">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<div class="control-group">
+							<label class="control-label"></label>
+							<div class="controls">
+								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Password</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+			</div>
+		</div><!--/span-->
+
+		{if $permission != '1'}
+		<div class="col-sm-4 js-masonry-item">
+		<div class="panel panel-default">
+			<div class="panel-heading" data-original-title="">
+				<span class="icon-th"></span> Add User
+			</div>
+			<div class="panel-body">
+				<div class="row-fluid">
+					<form id="addUser" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<legend>Add User</legend>
+
+						<div class="control-group {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}error{/if}">
+							<label class="control-label">Username</label>
+								<div class="controls">
+									<div class="input-prepend">
+									<span style="margin-left:5px;" class="add-on"><span class="icon-user"></span></span>
+										<input type="text" placeholder="Username" name="Username" id="Username" class="setup-width" {if isset($prevUsername)}value="{$prevUsername}"{/if}>
+										{if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}<span class="help-inline">{$USERNAME}</span>{/if}
+									</div>
+								</div>
+						</div>
+
+						<div class="control-group {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}error{/if}">
+							<label class="control-label">Password</label>
+								<div class="controls">
+								    <div class="input-prepend">
+										<span style="margin-left:5px;" class="add-on"><span class="icon-lock"></span></span>
+										<input type="password" placeholder="Password" name="Password" id="Password" class="setup-width">
+										{if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$PASSWORD}</span>{/if}
+									 </div>
+								</div>
+						</div>
+
+						<div class="control-group {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}error{/if}">
+							<label class="control-label">Confirm Password</label>
+								<div class="controls">
+								    <div class="input-prepend">
+										<span style="margin-left:5px;" class="add-on"><span class="icon-lock"></span></span>
+										<input type="password" placeholder="Confirm Password" name="ConfirmPass" id="ConfirmPass" class="setup-width">
+										{if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$CPASSWORD}</span>{/if}
+									 </div>
+								</div>
+						</div>
+
+						<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE" and isset($do)}error{/if}">
+						<label class="control-label">Email</label>
+							<div class="controls">
+							    <div class="input-prepend">
+								<span style="margin-left:5px;" class="add-on"><span class="icon-envelope"></span></span>
+									<input type="text" class="setup-width" id="Email" name="Email" placeholder="Email" {if isset($prevEmail)}value="{$prevEmail}"{/if}>
+									{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE" and isset($do)}<span class="help-inline">{$EMAIL}</span>{/if}
+							    </div>
+							</div>
+						</div>
+
+
+						{if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "ok"}
+						<div class="alert alert-success">
+							The user has been created!
+						</div>
+						{/if}
+
+						{if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "shardoffline"}
+						<div class="alert alert-warning">
+							The user is created, though the shard seems offline, it may take some time to see the change on the shard.
+						</div>
+						{/if}
+
+						<input type="hidden" name="function" value="add_user">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<div class="control-group">
+							<label class="control-label"></label>
+							<div class="controls">
+								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Create User</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+			</div>
+		</div><!--/span-->
+		{/if}
+
+		<div class="col-sm-4 js-masonry-item">
+		<div class="panel panel-default">
+			<div class="panel-heading" data-original-title="">
+				<span class="icon-th"></span> Change Email
+			</div>
+			<div class="panel-body">
+				<div class="row-fluid">
+					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<legend>Change Email</legend>
+						<div class="control-group {if isset($CEMAIL_ERROR) and $CEMAIL_ERROR eq "TRUE"}error{/if}">
+						<label class="control-label">New Email</label>
+							<div class="controls">
+							    <div class="input-prepend">
+								<span class="add-on" style="margin-left:5px;"><span class="icon-envelope"></span></span>
+									<input type="text" class="setup-width" id="NewEmail" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
+									{if isset($CEMAIL_ERROR) and $CEMAIL_ERROR eq "TRUE"}<span class="help-inline">{$EMAIL}</span>{/if}
+
+							    </div>
+							</div>
+						</div>
+
+
+						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
+						<div class="alert alert-success">
+							The email has been changed!
+						</div>
+						{/if}
+
+						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "SHARDOFF"}
+						<div class="alert alert-warning">
+							The email has been changed, though the shard seems offline, it may take some time to see the change on the shard.
+						</div>
+						{/if}
+
+						<input type="hidden" name="function" value="change_mail">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<div class="control-group">
+							<label class="control-label"></label>
+							<div class="controls">
+								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Email</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+			</div>
+		</div>
+
+		<div class="col-sm-4 js-masonry-item">
+		<div class="panel panel-default">
+			<div class="panel-heading" data-original-title="">
+				<span class="icon-envelope"></span> Ticket updates
+			</div>
+
+
+			<div class="panel-body">
+				<div class="row-fluid">
+					<form id="changeReceiveMail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<legend>Ticket-Update Mail Settings</legend>
+
+						<div class="control-group">
+							<label class="control-label">Receive ticket updates</label>
+							<div class="controls">
+								 <select name="ReceiveMail">
+									<option value="1" {if isset($ReceiveMail) and $ReceiveMail eq 1}selected="selected"{/if}>Yes</option>
+									<option value="0" {if isset($ReceiveMail) and $ReceiveMail eq 0}selected="selected"{/if}>No</option>
+								</select>
+							</div>
+
+						</div>
+
+						<input type="hidden" name="function" value="change_receivemail">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<div class="control-group">
+							<label class="control-label"></label>
+							<div class="controls">
+								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Updates</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+			</div>
+		</div><!--/span-->
+
+		<div class="col-sm-4 js-masonry-item">
+		<div class="panel panel-default">
+			<div class="panel-heading" data-original-title="">
+				<span class="icon-th"></span> Change Info
+			</div>
+			<div class="panel-body">
+				<div class="row-fluid">
+					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<legend>Change Info</legend>
+
+						<div class="control-group">
+						<label class="control-label">Firstname</label>
+							<div class="controls">
+							    <div class="input-prepend">
+								<span class="add-on" style="margin-left:5px;"><span class="icon-user"></span></span>
+									<input type="text" class="setup-width" id="FirstName" name="FirstName" placeholder="Your firstname" {if isset($FirstName) and $FirstName neq ""}value="{$FirstName}"{/if}>
+								</div>
+							</div>
+						</div>
+
+						<div class="control-group">
+						<label class="control-label">Lastname</label>
+							<div class="controls">
+							    <div class="input-prepend">
+								<span class="add-on" style="margin-left:5px;"><span class="icon-user"></span></span>
+									<input type="text" class="setup-width" id="LastName" name="LastName" placeholder="Your lastname" {if isset($LastName) and $LastName neq ""}value="{$LastName}"{/if}>
+								</div>
+							</div>
+						</div>
+
+						<div class="control-group">
+						<label class="control-label">Country</label>
+							<div class="controls">
+								 <select name="Country">
+									{foreach from=$country_array key=k item=v}
+										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
+									{/foreach}
+								</select>
+							</div>
+						</div>
+
+						<div class="control-group gender-list">
+							<label class="control-label">Gender</label>
+							<div class="controls">
+								<label class="radio">
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 0}checked{/if}"><input name="Gender" id="optionsRadios0" value="0" {if isset($Gender) and $Gender eq 0}checked=""{/if} type="radio"></span></div>
+								      Secret
+								</label>
+								<div style="clear:both"></div>
+								<label class="radio">
+									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($Gender) and $Gender eq 1}checked{/if}"><input name="Gender" id="optionsRadios1" value="1" {if isset($Gender) and $Gender eq 1}checked=""{/if} type="radio"></span></div>
+									Male
+								</label>
+								<div style="clear:both"></div>
+								<label class="radio">
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 2}checked{/if}"><input name="Gender" id="optionsRadios2" value="2" {if isset($Gender) and $Gender eq 2}checked=""{/if} type="radio"></span></div>
+								      Female
+								</label>
+							</div>
+						</div>
+
+						{if isset($info_updated) and $info_updated eq "OK"}
+						<div class="alert alert-success">
+							The Info has been updated!
+						</div>
+						{/if}
+
+						<input type="hidden" name="function" value="change_info">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<div class="control-group">
+							<label class="control-label"></label>
+							<div class="controls">
+								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Info</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+			</div>
+		</div><!--/span-->
+		
+		{if $permission == '3'}
+		<div class="col-sm-4 js-masonry-item">
+		<div class="panel panel-default">
+			<div class="panel-heading" data-original-title="">
+				<span class="icon-th"></span> User Registration
+			</div>
+			<div class="panel-body">
+				<div class="row-fluid">
+					<form id="userRegistration" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<legend>User Registration</legend>
+
+						<div class="control-group gender-list">
+							<div class="controls">
+								<label class="radio">
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 0}checked{/if}"><input name="userRegistration" id="optionsRadios0" value="0" {if isset($userRegistration) and $userRegistration eq 0}checked=""{/if} type="radio"></span></div>
+								      In-Game and Web Registration
+								</label>
+								<div style="clear:both"></div>
+								<label class="radio">
+									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 1}checked{/if}"><input name="userRegistration" id="optionsRadios1" value="1" {if isset($userRegistration) and $userRegistration eq 1}checked=""{/if} type="radio"></span></div>
+									In-Game Registration Only
+								</label>
+								<div style="clear:both"></div>
+								<label class="radio">
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 2}checked{/if}"><input name="userRegistration" id="optionsRadios2" value="2" {if isset($userRegistration) and $userRegistration eq 2}checked=""{/if} type="radio"></span></div>
+								      Web Registration Only
+								</label>
+								<div style="clear:both"></div>
+								<label class="radio">
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($userRegistration) and $userRegistration eq 3}checked{/if}"><input name="userRegistration" id="optionsRadios2" value="3" {if isset($userRegistration) and $userRegistration eq 3}checked=""{/if} type="radio"></span></div>
+								      No Registration
+								</label>
+							</div>
+						</div>
+
+						<input type="hidden" name="function" value="userRegistration">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<div class="control-group">
+							<label class="control-label"></label>
+							<div class="controls">
+								<button type="submit" class="btn btn-primary" style="margin-left:5px;">Change Setting</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+			</div>
+		</div><!--/span-->
+		{/if}
+		
+	</div><!--/row-->
+
+	<script src="js/masonry.pkgd.min.js"></script>
+
+{/block}
+