diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php index e0db5203..264b2988 100644 --- a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php +++ b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php @@ -317,7 +317,7 @@ $GLOBALS['LSobjects']['LSeepeople'] = array ( 'description' => array ( 'label' => _('Description'), 'ldap_type' => 'ascii', - 'html_type' => 'text', + 'html_type' => 'textarea', 'rights' => array( 'self' => 'w', 'user' => 'r', diff --git a/trunk/conf/config.inc.php b/trunk/conf/config.inc.php index 1b3199e1..a4d3b94f 100644 --- a/trunk/conf/config.inc.php +++ b/trunk/conf/config.inc.php @@ -151,6 +151,17 @@ $GLOBALS['LSconfig'] = array( ) ); +// Interface +// Theme Black +//define('LS_THEME','black'); +//define('LS_TEMPLATES_DIR', 'templates/default'); + +// Theme Default +define('LS_THEME','default'); +define('LS_TEMPLATES_DIR', 'templates/'.LS_THEME); +define('LS_IMAGES_DIR', 'images/'.LS_THEME); +define('LS_CSS_DIR', 'css/'.LS_THEME); + //Debug $GLOBALS['LSdebug']['active'] = true; @@ -174,7 +185,7 @@ define('LS_LIB_DIR', LS_INCLUDE_DIR .'libs/'); define('LS_ADDONS_DIR', LS_INCLUDE_DIR .'addons/'); define('LS_JS_DIR', LS_INCLUDE_DIR .'js/'); define('LS_TMP_DIR', 'tmp/'); -define('LS_CSS_DIR', 'templates/css/'); + // Javascript $GLOBALS['defaultJSscipts']=array( diff --git a/trunk/css/black/LSconfirmBox.css b/trunk/css/black/LSconfirmBox.css new file mode 100644 index 00000000..2a0a8cd9 --- /dev/null +++ b/trunk/css/black/LSconfirmBox.css @@ -0,0 +1,57 @@ +#box-LSconfirmBox { + -moz-border-radius: 5px; + margin: auto; + position: absolute; + z-index: 4; + display: none; + position: absolute; + background-color: #33302b; + min-height: 6em; +} + +#title-LSconfirmBox { + width: 100%; + font-weight: bold; + color: #fff; + padding: 0px; + padding-left: 0.5em; + margin: 0px; + opacity: 0; +} + +#text-LSconfirmBox { + width: 90%; + padding: 0px 5% 0px 5%; + text-align: center; + font-size: 0.8em; + font-style: italic; + color: #fff; + opacity: 0; +} + +#closeBtn-LSconfirmBox { + background: url(../../images/black/close.png) no-repeat; + width: 20px; + height: 20px; + position: absolute; + top: -10px; + right: -10px; + cursor: pointer; + opacity: 0; +} + +#btnsBox-LSconfirmBox { + width: 100%; + text-align: center; + opacity: 0; +} + +.btn-LSconfirmBox { + background-color: #fff; + -moz-border-radius: 5px; + color: #33302b; + font-weight: bold; + padding: 3px; + cursor: pointer; + margin: 2px; +} diff --git a/trunk/css/black/LSdefault.css b/trunk/css/black/LSdefault.css new file mode 100644 index 00000000..a7d2dfec --- /dev/null +++ b/trunk/css/black/LSdefault.css @@ -0,0 +1,54 @@ +#LSerror { + width: 50%; + position: absolute; + top: 10px; + left: 10px; + background-color: #f00; + visibility: hidden; + color: #fff; + z-index: 100; +} + +#LSerror_txt { + display: none; +} + +#LSdebug { + width: 50%; + position: absolute; + top: 10px; + left: 50%; + background-color: #84ff6a; + visibility: hidden; + color: #fff; + z-index: 100; +} + +#LSdebug_txt { + display: none; +} + +#LSjsConfig { + display: none; +} + +#LSdebug_hidden { + float: right; + color: #fff; + text-decoration: none; + font-weight: bold; + cursor: pointer; +} + +#LSinfos { + position: absolute; + width: 50%; + left: 25%; + background-color: #dedede; + border: 1px solid #53504b; + visibility: hidden; + color: #53504b; + z-index: 100; + top: 10px; + font-weight: bold; +} diff --git a/trunk/css/black/LSform.css b/trunk/css/black/LSform.css new file mode 100644 index 00000000..97d889e1 --- /dev/null +++ b/trunk/css/black/LSform.css @@ -0,0 +1,95 @@ +/* + ****************** + * LSForm + ****************** + */ + +/* + * Architecture + */ +dl.LSform { + margin: 0; + margin-left: 2em; + padding: 0; +} + +.LSform dt { + position: relative; + left: 0.2em; + top: 1.2em; + width: 15em; + font-weight: bold; + font-size: 0.9em; + color: #433f3a; +} + +dd.LSform { + margin-left: 15em; + padding: 0; +} + +ul.LSform { + list-style-type: none; + padding: 0; + margin: 0; +} + +ul.LSform li { + overflow: auto; + margin-bottom: 2px; +} + +/* + * Champs du formulaire + */ +.LSform input[type=text], .LSform input[type=file], .LSform input[type=submit], .LSform input[type=password], .LSform select, .LSform textarea { + border: 1px solid #cac9c4; + width: 300px; + background-color: #dedede; +} + +.LSform input[type=radio] { + width: undefinded; +} + +input[type='submit'].LSform { + border: 1px outset #cac9c4; + margin-top: 1em; + margin-left: 6em; + width: 8em; +} + +dd.LSform-errors { + color: #fff; + background-color: #f59a67; + width: 302px; +} + +dt.LSform-errors { + color: #f59a67; +} + +/* Bouton JS */ +img.LSform-add-field-btn, img.LSform-remove-field-btn { + cursor: pointer; +} + +/* Tips */ +.tip-top { + color: #fff; + width: 139px; + z-index: 13000; +} + +.tip-title { + font-weight: bold; + font-size: 11px; + margin: 0; + color: #dedede; + padding: 2px; + background: #33302b; + opacity: 0.8; + -moz-border-radius: 2px; + max-width: 500px; + text-align: justify; +} diff --git a/trunk/css/black/LSformElement_image.css b/trunk/css/black/LSformElement_image.css new file mode 100644 index 00000000..45f91743 --- /dev/null +++ b/trunk/css/black/LSformElement_image.css @@ -0,0 +1,33 @@ +/* + * LSformElement_image + */ +div.LSformElement_image { + float: right; + clear: both; + margin: 2em; + background-color: #595651; + width: 160px; + padding: 5px; + text-align: center; + -moz-border-radius: 1em; +} + +img.LSformElement_image { + width: 150px; + border: 1px solid #fff; + margin: 5px; +} + +div.LSformElement_image_errors { + background-color: #f59a67; +} + +ul.LSformElement_image_actions { + list-style-type: none; + position: absolute; + margin-top: 8px; + margin-left: 135px; + padding: 0; + visibility: hidden; + cursor: pointer; +} diff --git a/trunk/templates/css/LSformElement_password.css b/trunk/css/black/LSformElement_password.css similarity index 100% rename from trunk/templates/css/LSformElement_password.css rename to trunk/css/black/LSformElement_password.css diff --git a/trunk/css/black/LSformElement_select_object.css b/trunk/css/black/LSformElement_select_object.css new file mode 100644 index 00000000..29e39a5b --- /dev/null +++ b/trunk/css/black/LSformElement_select_object.css @@ -0,0 +1,29 @@ +/* + * LSformElement_select_object + */ +a.LSformElement_select_object { + text-decoration: none; + color: #33302b; + font-weight: normal; + +} + +ul.LSformElement_select_object_edit { + border: 1px solid #dedede; + border-bottom: none; + width: 300px; +} + +li.LSformElement_select_object { + padding: 0.1em; + border-bottom: 1px solid #dedede; +} + +li.LSformElement_select_object_addBtn { + background-color: #dedede; + text-align: center; +} + +img.LSformElement_select_object_deleteBtn { + cursor: pointer; +} diff --git a/trunk/css/black/LSformElement_ssh_key.css b/trunk/css/black/LSformElement_ssh_key.css new file mode 100644 index 00000000..4b9035c2 --- /dev/null +++ b/trunk/css/black/LSformElement_ssh_key.css @@ -0,0 +1,22 @@ +/* + * LSformElement_ssh_key + */ +.LSformElement_ssh_key_value { + display: none; + width: 30em; + font-style: italic; + font-family: courier; + background-color: #dedede; + border: 1px solid #cac9c4; + overflow: auto; +} + +.LSformElement_ssh_key_short_display { + font-style: italic; + font-family: courier; + cursor: pointer; +} + +textarea.LSformElement_ssh_key { + height: 10em; +} diff --git a/trunk/templates/css/LSmail.css b/trunk/css/black/LSmail.css similarity index 100% rename from trunk/templates/css/LSmail.css rename to trunk/css/black/LSmail.css diff --git a/trunk/css/black/LSrelation.css b/trunk/css/black/LSrelation.css new file mode 100644 index 00000000..2ccc784b --- /dev/null +++ b/trunk/css/black/LSrelation.css @@ -0,0 +1,18 @@ +/* + *********************** + * LSrelation + *********************** + */ +h1.LSrelation { + font-size: 1.4em; +} + +img.LSrelation-btn { + margin-left: 0.5em; +} + +a.LSrelation { + text-decoration: none; + color: #33302b; + font-weight: normal; +} diff --git a/trunk/templates/css/LSselect.css b/trunk/css/black/LSselect.css similarity index 100% rename from trunk/templates/css/LSselect.css rename to trunk/css/black/LSselect.css diff --git a/trunk/css/black/LSsmoothbox.css b/trunk/css/black/LSsmoothbox.css new file mode 100644 index 00000000..61598f79 --- /dev/null +++ b/trunk/css/black/LSsmoothbox.css @@ -0,0 +1,55 @@ +#over-LSsmoothbox { + background-color: #33302b; + border: 1px solid #33302b; + margin: 0; + padding: 0; +} + +#win-LSsmoothbox { + background-color: #fff; + border: 10px solid #33302b; + -moz-border-radius: 5px; + margin: auto; + position: absolute; + z-index: 3; + display: none; +} + +#frame-LSsmoothbox { + overflow: auto; + height: 100%; + width: 100%; + display: none; +} + +#closeBtn-LSsmoothbox { + background: url(../../images/black/close.png) no-repeat; + width: 20px; + height: 20px; + position: absolute; + top: -20px; + right: -20px; + cursor: pointer; + display: none; +} + +#validBtn-LSsmoothbox { + background-color: #33302b; + -moz-border-radius: 5px; + height: 22px; + font-size: 18px; + color: #fff; + font-weight: bold; + padding: 0px 5px 0px 5px; + position: absolute; + bottom: -25px; + right: 20px; + cursor: pointer; + display: none; +} + +#loadingImage-LSsmoothbox { + width: 100px; + height: 100px; + margin: 10px; +} diff --git a/trunk/css/black/base.css b/trunk/css/black/base.css new file mode 100644 index 00000000..6a4308e7 --- /dev/null +++ b/trunk/css/black/base.css @@ -0,0 +1,297 @@ +body { + font-family: sans-serif; + margin: 5px; + padding: 0; + background-color: #433f3a; +} + +img { + vertical-align: bottom; +} + +a:hover { + text-decoration: underline; +} + +h1 { + margin: 0.5em; + margin-bottom: 1px; + border-bottom: 1px solid #433f3a; + color: #433f3a; + clear: left; +} + +a img { + border: none; +} + +hr { + visibility: hidden; + clear: both; + height: 0px; +} + +.btn { + cursor: pointer; + margin: 2px; +} + +/* + * Interface + */ +#main { + width: 1000px; + margin: auto; + border: 1px solid #33302b; + background: #fff url(../../images/black/fd_menu.png) repeat-y scroll left top; + min-height: 500px; +} + +#left { + float: left; + width: 160px; +} + +#right { + margin: 0; + float: left; + width: 840px; +} + +#logo { + margin: auto; + width: 142px; + margin-left: 9px; +} + +#status { + margin: 0; + padding: 0; + font-size: 0.7em; + color: #fff; + text-align: right; + background-color: #53504b; + padding: 0.3em; +} + +#user_name { + font-weight: bold; +} + +/* + * LSsession + */ +#LSsession_topDn { + height: 1.5em; + width: 150px; +} + +#LSsession_topDn_form { + width: 150px; + margin: 5px; + color: #fff; +} + +/* + ****************** + * Menu + ****************** + */ +ul.menu { + list-style-image: url(../../images/black/puce.png); +} + +li.menu { + color: #fff; +} + +a.menu { + color: #fff; + text-decoration: none; +} + +/* + **************** + * LSobject-list + **************** + */ + +table.LSobject-list { + margin-left: 1em; + margin-top: 0.5em; + border: 1px solid #595651; + width: 805px; + border-collapse: collapse; + clear: both; +} + +/* + * th + */ +th.LSobject-list { + background-color: #595651; + color: #fff; +} + +a th.LSobject-list { + text-decoration: none; +} + +th.LSobject-list-subdn { + width: 15em; +} + +img.LSobject-list-ordersense { + vertical-align: middle; +} + +th.LSobject-list a { + color: #fff; + text-decoration: none; +} + +/* + * tr + */ +tr.LSobject-list-bis { + background-color: #f2f2f2; + background-color: #bddff1; + background-color: #dedede; +} + +/* + * td + */ +td.LSobject-list { + border: 1px solid #595651; + padding: 0.1em; +} + +td.LSobject-list-without-result { + text-align: center; +} + +a.LSobject-list { + color: #33302b; + text-decoration: none; +} + +/* Action */ +a.LSobject-list-actions { + color: #433f3a; + text-decoration: none; +} + +a.LSobject-list-actions:hover { + text-decoration: underline; +} + +td.LSobject-list-actions { + text-align: center; + width: 7em; +} + +/* Name */ +td.LSobject-list-names { + cursor: pointer; +} + +/* + * Liste des pages + */ +p.LSobject-list-page { + text-align: center; + margin: 0.5em; +} + +a.LSobject-list-page { + color: #595651; + text-decoration: none; +} + +a.LSobject-list-page:hover { + color: #433f3a; +} + +strong.LSobject-list-page { + color: #433f3a; +} + +/* + ******************* + * LSview-actions + ******************* + */ +a.LSview-actions { + text-decoration: none; + color: #33302b; +} + +ul.LSview-actions { + clear: both; + text-align: right; + font-size: 0.8em; + margin: 0; + margin-top: 0.4em; + margin-right: 3em; + margin-bottom: 0.8em; + color: #433f3a; +} + +li.LSview-actions { + text-decoration: none; + color: #33302b; + border: 1px solid #433f3a; + border-top: 0; + padding: 0.4em; + display: inline; + margin-right: 1px; +} + +/* + ******************* + * question + ******************* + */ +p.question { + margin-left: 3em; +} + +a.question { + margin-left: 10em; + margin-top: 3em; + color: #433f3a; +} + +/* + ********************* + * LSview_search + ********************* + */ +form.LSview_search { + float: right; + margin: 0; + margin-top: 0.5em; + margin-right: 2em; +} + +#LSview_search_param { + margin: 0px; + padding: 0px; +} + +label.LSview_search { + font-size: 0.6em; +} + +input[type='text'].LSview_search { + border: 1px solid #433f3a; + width: 12em; +} + +input[type='submit'].LSview_search { + border: 1px solid #433f3a; + width: 8em; + background-color: #595651; + color: #fff; +} diff --git a/trunk/templates/css/base_print.css b/trunk/css/black/base_print.css similarity index 100% rename from trunk/templates/css/base_print.css rename to trunk/css/black/base_print.css diff --git a/trunk/css/black/color.html b/trunk/css/black/color.html new file mode 100644 index 00000000..0bfd235f --- /dev/null +++ b/trunk/css/black/color.html @@ -0,0 +1,19 @@ + +
#000 +
#33302b +
#433f3a +
#53504b +
#595651 +
#cac9c4 +
#dedede +
#f2f2f2 +
#fff
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/trunk/css/black/login.css b/trunk/css/black/login.css new file mode 100644 index 00000000..f29a746d --- /dev/null +++ b/trunk/css/black/login.css @@ -0,0 +1,67 @@ +body { + background-color: #433f3a; +} + +#loginform-logo { + float: left; +} + +div.loginform { + margin: auto; + margin-top: 10%; + border: 1px solid #53504b; + padding: 1em; + width: 30em; + background: #cac9c4 url(../../images/black/login_fd.png) no-repeat scroll 98% 98%; +} + +dl.loginform { + margin: 0; + padding: 0; +} + +.loginform dt { + position: relative; + left: 0; + top: 1.1em; + width: 8em; + font-weight: bold; + font-size: 0.9em; +} + +.loginform dd { + margin: 0 0 0 9em; + padding: 0 0 0em 0em; +} + +.loginform-level{ + display: none; +} + +.loginform-id { + visibility: hidden; +} + +.loginform input, .loginform select { + border: 1px inset #cac9c4; + width: 13em; +} + +.loginform input[type='submit'] { + border: 1px outset #cac9c4; + width: 11em; + margin: 1em; +} + +#loading_zone { + float: right; + margin-left: 1em; +} + +#LSsession_lostPassword { + float: right; + font-size: 0.8em; + text-decoration: none; + color: #53504b; + font-weight: bold; +} diff --git a/trunk/css/black/recoverpassword.css b/trunk/css/black/recoverpassword.css new file mode 100644 index 00000000..2b781a61 --- /dev/null +++ b/trunk/css/black/recoverpassword.css @@ -0,0 +1,64 @@ +body { + background-color: #433f3a; +} + +#recoverpasswordform-logo { + float: left; +} + +div.recoverpasswordform { + margin: auto; + margin-top: 10%; + border: 1px solid #53504b; + padding: 1em; + width: 30em; + background: #cac9c4 url(../../images/black/login_fd.png) no-repeat scroll 98% 98%; +} + +dl.recoverpasswordform { + margin: 0; + padding: 0; +} + +.recoverpasswordform dt { + position: relative; + left: 0; + top: 1.1em; + width: 8em; + font-weight: bold; + font-size: 0.9em; +} + +.recoverpasswordform dd { + margin: 0 0 0 9em; + padding: 0 0 0em 0em; +} + +.recoverpasswordform input, .recoverpasswordform select { + border: 1px inset #cac9c4; + width: 13em; +} + +.recoverpasswordform input[type='submit'] { + border: 1px outset #cac9c4; + width: 11em; + margin: 1em; +} + +#loading_zone { + float: right; + margin-left: 1em; +} + +#recoverpassword_msg { + text-align: center; + font-weight: bold; +} + +#recoverpassword_back { + float: right; + font-size: 0.8em; + text-decoration: none; + color: #53504b; + font-weight: bold; +} diff --git a/trunk/templates/css/LSconfirmBox.css b/trunk/css/default/LSconfirmBox.css similarity index 94% rename from trunk/templates/css/LSconfirmBox.css rename to trunk/css/default/LSconfirmBox.css index 0cd490ae..16e868a3 100644 --- a/trunk/templates/css/LSconfirmBox.css +++ b/trunk/css/default/LSconfirmBox.css @@ -30,7 +30,7 @@ } #closeBtn-LSconfirmBox { - background: url(../images/close.png) no-repeat; + background: url(../../images/default/close.png) no-repeat; width: 20px; height: 20px; position: absolute; diff --git a/trunk/templates/css/LSdefault.css b/trunk/css/default/LSdefault.css similarity index 97% rename from trunk/templates/css/LSdefault.css rename to trunk/css/default/LSdefault.css index a9a2fe3b..0750b535 100644 --- a/trunk/templates/css/LSdefault.css +++ b/trunk/css/default/LSdefault.css @@ -44,7 +44,7 @@ position: absolute; width: 50%; left: 25%; - background-color: #bee2f0; + background-color: #b5e4f6; border: 1px solid #4096b8; visibility: hidden; color: #4096b8; diff --git a/trunk/templates/css/LSform.css b/trunk/css/default/LSform.css similarity index 91% rename from trunk/templates/css/LSform.css rename to trunk/css/default/LSform.css index ff98abf8..9ac3dea1 100644 --- a/trunk/templates/css/LSform.css +++ b/trunk/css/default/LSform.css @@ -43,7 +43,7 @@ ul.LSform li { * Champs du formulaire */ .LSform input[type=text], .LSform input[type=file], .LSform input[type=submit], .LSform input[type=password], .LSform select, .LSform textarea { - border: 1px solid #ccc; + border: 1px solid #84ff6a; width: 300px; background-color: #b5e4f6; } @@ -59,9 +59,14 @@ input[type='submit'].LSform { width: 8em; } -.LSform-errors { +dd.LSform-errors { color: #fff; background-color: #f59a67; + width: 302px; +} + +dt.LSform-errors { + color: #f59a67; } /* Bouton JS */ diff --git a/trunk/templates/css/LSformElement_image.css b/trunk/css/default/LSformElement_image.css similarity index 100% rename from trunk/templates/css/LSformElement_image.css rename to trunk/css/default/LSformElement_image.css diff --git a/trunk/css/default/LSformElement_password.css b/trunk/css/default/LSformElement_password.css new file mode 100644 index 00000000..dd2ab0c8 --- /dev/null +++ b/trunk/css/default/LSformElement_password.css @@ -0,0 +1,6 @@ +/* + * LSformElement_password + */ +img.LSformElement_password_view_btn, img.LSformElement_password_generate_btn, img.LSformElement_password_verify_btn { + cursor: pointer; +} diff --git a/trunk/templates/css/LSformElement_select_object.css b/trunk/css/default/LSformElement_select_object.css similarity index 100% rename from trunk/templates/css/LSformElement_select_object.css rename to trunk/css/default/LSformElement_select_object.css diff --git a/trunk/templates/css/LSformElement_ssh_key.css b/trunk/css/default/LSformElement_ssh_key.css similarity index 100% rename from trunk/templates/css/LSformElement_ssh_key.css rename to trunk/css/default/LSformElement_ssh_key.css diff --git a/trunk/css/default/LSmail.css b/trunk/css/default/LSmail.css new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/trunk/css/default/LSmail.css @@ -0,0 +1 @@ + diff --git a/trunk/templates/css/LSrelation.css b/trunk/css/default/LSrelation.css similarity index 100% rename from trunk/templates/css/LSrelation.css rename to trunk/css/default/LSrelation.css diff --git a/trunk/css/default/LSselect.css b/trunk/css/default/LSselect.css new file mode 100644 index 00000000..611fbc7f --- /dev/null +++ b/trunk/css/default/LSselect.css @@ -0,0 +1,44 @@ +/* + ************************ + * LSselect + ************************ + */ + +#LSselect-object { + width: 570px; +} + +.sortBy_displayValue, .sortBy_subDn { + cursor: pointer; +} + +.LSobject-select-check { + width: 10px; +} + +.LSobject-select-names { + cursor: pointer; +} + +#LSselect_topDn_label { + float: left; + font-size: 0.8em; + margin-left: 1em; + margin-top: 0.5em; +} + + /* + * LSselect_search + */ +form.LSselect_search { + float: none; + margin-top: 0.5em; +} + +div.LSselect_search { + float: right; +} + +div.LSobject-select { + width: 600px; +} diff --git a/trunk/templates/css/LSsmoothbox.css b/trunk/css/default/LSsmoothbox.css similarity index 94% rename from trunk/templates/css/LSsmoothbox.css rename to trunk/css/default/LSsmoothbox.css index 7c1ce8c6..a5b1320e 100644 --- a/trunk/templates/css/LSsmoothbox.css +++ b/trunk/css/default/LSsmoothbox.css @@ -23,7 +23,7 @@ } #closeBtn-LSsmoothbox { - background: url(../images/close.png) no-repeat; + background: url(../../images/default/close.png) no-repeat; width: 20px; height: 20px; position: absolute; diff --git a/trunk/templates/css/base.css b/trunk/css/default/base.css similarity index 95% rename from trunk/templates/css/base.css rename to trunk/css/default/base.css index 2c150bb7..7422a547 100644 --- a/trunk/templates/css/base.css +++ b/trunk/css/default/base.css @@ -42,7 +42,7 @@ hr { width: 1000px; margin: auto; border: 1px solid #52bce5; - background: #fff url(../images/fd_menu.png) repeat-y scroll left top; + background: #fff url(../../images/default/fd_menu.png) repeat-y scroll left top; min-height: 500px; } @@ -97,7 +97,7 @@ hr { ****************** */ ul.menu { - list-style-image: url(../images/puce.png); + list-style-image: url(../../images/default/puce.png); } li.menu { @@ -154,6 +154,8 @@ th.LSobject-list a { */ tr.LSobject-list-bis { background-color: #ecf8fd; + background-color: #bddff1; + background-color: #c1d7e3; } /* diff --git a/trunk/css/default/base_print.css b/trunk/css/default/base_print.css new file mode 100644 index 00000000..f5e52374 --- /dev/null +++ b/trunk/css/default/base_print.css @@ -0,0 +1,15 @@ +#main { + width: 840px; +} + +#left { + display: none; +} + +#status { + display: none; +} + +p.LSview-actions { + display: none; +} diff --git a/trunk/css/default/color.html b/trunk/css/default/color.html new file mode 100644 index 00000000..9d96548c --- /dev/null +++ b/trunk/css/default/color.html @@ -0,0 +1,25 @@ +
#f00 +
#f59a67 +
#84ff6a +
#000 +
#333 +
#0072b8 +
#4096b8 +
#52bce5 +
#ccc +
#b5e4f6 +
#ecf8fd +
#fff +
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/trunk/templates/css/login.css b/trunk/css/default/login.css similarity index 86% rename from trunk/templates/css/login.css rename to trunk/css/default/login.css index d3e839be..675b76cd 100644 --- a/trunk/templates/css/login.css +++ b/trunk/css/default/login.css @@ -5,10 +5,10 @@ div.loginform { margin: auto; margin-top: 10%; - border: 1px solid #69c; + border: 1px solid #4096b8; padding: 1em; width: 30em; - background: transparent url(../images/login_fd.png) no-repeat scroll 98% 98%; + background: transparent url(../../images/default/login_fd.png) no-repeat scroll 98% 98%; } dl.loginform { @@ -58,6 +58,6 @@ dl.loginform { float: right; font-size: 0.8em; text-decoration: none; - color: #69c; + color: #4096b8; font-weight: bold; } diff --git a/trunk/templates/css/recoverpassword.css b/trunk/css/default/recoverpassword.css similarity index 87% rename from trunk/templates/css/recoverpassword.css rename to trunk/css/default/recoverpassword.css index ec9b0027..67bfab68 100644 --- a/trunk/templates/css/recoverpassword.css +++ b/trunk/css/default/recoverpassword.css @@ -5,10 +5,10 @@ div.recoverpasswordform { margin: auto; margin-top: 10%; - border: 1px solid #69c; + border: 1px solid #4096b8; padding: 1em; width: 30em; - background: transparent url(../images/login_fd.png) no-repeat scroll 98% 98%; + background: transparent url(../../images/default/login_fd.png) no-repeat scroll 98% 98%; } dl.recoverpasswordform { @@ -55,6 +55,6 @@ dl.recoverpasswordform { float: right; font-size: 0.8em; text-decoration: none; - color: #69c; + color: #4096b8; font-weight: bold; } diff --git a/trunk/templates/images/ASC.png b/trunk/images/black/ASC.png similarity index 100% rename from trunk/templates/images/ASC.png rename to trunk/images/black/ASC.png diff --git a/trunk/templates/images/DESC.png b/trunk/images/black/DESC.png similarity index 100% rename from trunk/templates/images/DESC.png rename to trunk/images/black/DESC.png diff --git a/trunk/images/black/add.png b/trunk/images/black/add.png new file mode 100644 index 00000000..297a84f2 Binary files /dev/null and b/trunk/images/black/add.png differ diff --git a/trunk/images/black/ajax-loader.gif b/trunk/images/black/ajax-loader.gif new file mode 100644 index 00000000..d0bce154 Binary files /dev/null and b/trunk/images/black/ajax-loader.gif differ diff --git a/trunk/images/black/calendar.png b/trunk/images/black/calendar.png new file mode 100644 index 00000000..184d9707 Binary files /dev/null and b/trunk/images/black/calendar.png differ diff --git a/trunk/images/black/clear.png b/trunk/images/black/clear.png new file mode 100644 index 00000000..23b487a7 Binary files /dev/null and b/trunk/images/black/clear.png differ diff --git a/trunk/templates/images/close.png b/trunk/images/black/close.png similarity index 100% rename from trunk/templates/images/close.png rename to trunk/images/black/close.png diff --git a/trunk/images/black/copy.png b/trunk/images/black/copy.png new file mode 100644 index 00000000..723ca925 Binary files /dev/null and b/trunk/images/black/copy.png differ diff --git a/trunk/images/black/create.png b/trunk/images/black/create.png new file mode 100644 index 00000000..20c8e782 Binary files /dev/null and b/trunk/images/black/create.png differ diff --git a/trunk/images/black/delete.png b/trunk/images/black/delete.png new file mode 100644 index 00000000..16f313ea Binary files /dev/null and b/trunk/images/black/delete.png differ diff --git a/trunk/images/black/fd_menu.png b/trunk/images/black/fd_menu.png new file mode 100644 index 00000000..0e52530c Binary files /dev/null and b/trunk/images/black/fd_menu.png differ diff --git a/trunk/templates/images/generate.png b/trunk/images/black/generate.png similarity index 100% rename from trunk/templates/images/generate.png rename to trunk/images/black/generate.png diff --git a/trunk/images/black/help.png b/trunk/images/black/help.png new file mode 100644 index 00000000..0f5f06dd Binary files /dev/null and b/trunk/images/black/help.png differ diff --git a/trunk/images/black/hide.png b/trunk/images/black/hide.png new file mode 100644 index 00000000..4020d484 Binary files /dev/null and b/trunk/images/black/hide.png differ diff --git a/trunk/images/black/imgbroken.png b/trunk/images/black/imgbroken.png new file mode 100644 index 00000000..9efa5106 Binary files /dev/null and b/trunk/images/black/imgbroken.png differ diff --git a/trunk/templates/images/loading.gif b/trunk/images/black/loading.gif similarity index 100% rename from trunk/templates/images/loading.gif rename to trunk/images/black/loading.gif diff --git a/trunk/images/black/login_fd.png b/trunk/images/black/login_fd.png new file mode 100644 index 00000000..4e61167f Binary files /dev/null and b/trunk/images/black/login_fd.png differ diff --git a/trunk/images/black/logo.png b/trunk/images/black/logo.png new file mode 100644 index 00000000..f4fe1223 Binary files /dev/null and b/trunk/images/black/logo.png differ diff --git a/trunk/templates/images/logout.png b/trunk/images/black/logout.png similarity index 100% rename from trunk/templates/images/logout.png rename to trunk/images/black/logout.png diff --git a/trunk/images/black/mail.png b/trunk/images/black/mail.png new file mode 100644 index 00000000..85423c9d Binary files /dev/null and b/trunk/images/black/mail.png differ diff --git a/trunk/images/black/modify.png b/trunk/images/black/modify.png new file mode 100644 index 00000000..0a189149 Binary files /dev/null and b/trunk/images/black/modify.png differ diff --git a/trunk/images/black/person.png b/trunk/images/black/person.png new file mode 100644 index 00000000..c6f2663c Binary files /dev/null and b/trunk/images/black/person.png differ diff --git a/trunk/templates/images/puce.png b/trunk/images/black/puce.png similarity index 100% rename from trunk/templates/images/puce.png rename to trunk/images/black/puce.png diff --git a/trunk/images/black/refresh.png b/trunk/images/black/refresh.png new file mode 100644 index 00000000..cd4e15a4 Binary files /dev/null and b/trunk/images/black/refresh.png differ diff --git a/trunk/images/black/remove.png b/trunk/images/black/remove.png new file mode 100644 index 00000000..b28022e9 Binary files /dev/null and b/trunk/images/black/remove.png differ diff --git a/trunk/images/black/rss.png b/trunk/images/black/rss.png new file mode 100644 index 00000000..cebc19cb Binary files /dev/null and b/trunk/images/black/rss.png differ diff --git a/trunk/images/black/url_add.png b/trunk/images/black/url_add.png new file mode 100644 index 00000000..74195983 Binary files /dev/null and b/trunk/images/black/url_add.png differ diff --git a/trunk/images/black/url_go.png b/trunk/images/black/url_go.png new file mode 100644 index 00000000..98c6bd30 Binary files /dev/null and b/trunk/images/black/url_go.png differ diff --git a/trunk/templates/images/verify.png b/trunk/images/black/verify.png similarity index 100% rename from trunk/templates/images/verify.png rename to trunk/images/black/verify.png diff --git a/trunk/images/black/view.png b/trunk/images/black/view.png new file mode 100644 index 00000000..c690f4ab Binary files /dev/null and b/trunk/images/black/view.png differ diff --git a/trunk/images/black/xmpp.png b/trunk/images/black/xmpp.png new file mode 100644 index 00000000..13da82e5 Binary files /dev/null and b/trunk/images/black/xmpp.png differ diff --git a/trunk/images/black/zoom.png b/trunk/images/black/zoom.png new file mode 100644 index 00000000..2c574dc9 Binary files /dev/null and b/trunk/images/black/zoom.png differ diff --git a/trunk/images/default/ASC.png b/trunk/images/default/ASC.png new file mode 100644 index 00000000..f140f7d9 Binary files /dev/null and b/trunk/images/default/ASC.png differ diff --git a/trunk/images/default/DESC.png b/trunk/images/default/DESC.png new file mode 100644 index 00000000..a2da8174 Binary files /dev/null and b/trunk/images/default/DESC.png differ diff --git a/trunk/templates/images/add.png b/trunk/images/default/add.png similarity index 100% rename from trunk/templates/images/add.png rename to trunk/images/default/add.png diff --git a/trunk/templates/images/ajax-loader.gif b/trunk/images/default/ajax-loader.gif similarity index 100% rename from trunk/templates/images/ajax-loader.gif rename to trunk/images/default/ajax-loader.gif diff --git a/trunk/templates/images/calendar.png b/trunk/images/default/calendar.png similarity index 100% rename from trunk/templates/images/calendar.png rename to trunk/images/default/calendar.png diff --git a/trunk/templates/images/clear.png b/trunk/images/default/clear.png similarity index 100% rename from trunk/templates/images/clear.png rename to trunk/images/default/clear.png diff --git a/trunk/images/default/close.png b/trunk/images/default/close.png new file mode 100644 index 00000000..fcf3b380 Binary files /dev/null and b/trunk/images/default/close.png differ diff --git a/trunk/templates/images/copy.png b/trunk/images/default/copy.png similarity index 100% rename from trunk/templates/images/copy.png rename to trunk/images/default/copy.png diff --git a/trunk/templates/images/create.png b/trunk/images/default/create.png similarity index 100% rename from trunk/templates/images/create.png rename to trunk/images/default/create.png diff --git a/trunk/templates/images/delete.png b/trunk/images/default/delete.png similarity index 100% rename from trunk/templates/images/delete.png rename to trunk/images/default/delete.png diff --git a/trunk/templates/images/fd_menu.png b/trunk/images/default/fd_menu.png similarity index 100% rename from trunk/templates/images/fd_menu.png rename to trunk/images/default/fd_menu.png diff --git a/trunk/images/default/generate.png b/trunk/images/default/generate.png new file mode 100644 index 00000000..67de2c6c Binary files /dev/null and b/trunk/images/default/generate.png differ diff --git a/trunk/templates/images/help.png b/trunk/images/default/help.png similarity index 100% rename from trunk/templates/images/help.png rename to trunk/images/default/help.png diff --git a/trunk/templates/images/hide.png b/trunk/images/default/hide.png similarity index 100% rename from trunk/templates/images/hide.png rename to trunk/images/default/hide.png diff --git a/trunk/templates/images/imgbroken.png b/trunk/images/default/imgbroken.png similarity index 100% rename from trunk/templates/images/imgbroken.png rename to trunk/images/default/imgbroken.png diff --git a/trunk/images/default/loading.gif b/trunk/images/default/loading.gif new file mode 100644 index 00000000..cc70a7a8 Binary files /dev/null and b/trunk/images/default/loading.gif differ diff --git a/trunk/templates/images/login_fd.png b/trunk/images/default/login_fd.png similarity index 100% rename from trunk/templates/images/login_fd.png rename to trunk/images/default/login_fd.png diff --git a/trunk/templates/images/logo.png b/trunk/images/default/logo.png similarity index 100% rename from trunk/templates/images/logo.png rename to trunk/images/default/logo.png diff --git a/trunk/images/default/logout.png b/trunk/images/default/logout.png new file mode 100644 index 00000000..0010931e Binary files /dev/null and b/trunk/images/default/logout.png differ diff --git a/trunk/templates/images/mail.png b/trunk/images/default/mail.png similarity index 100% rename from trunk/templates/images/mail.png rename to trunk/images/default/mail.png diff --git a/trunk/templates/images/modify.png b/trunk/images/default/modify.png similarity index 100% rename from trunk/templates/images/modify.png rename to trunk/images/default/modify.png diff --git a/trunk/templates/images/person.png b/trunk/images/default/person.png old mode 100755 new mode 100644 similarity index 100% rename from trunk/templates/images/person.png rename to trunk/images/default/person.png diff --git a/trunk/images/default/puce.png b/trunk/images/default/puce.png new file mode 100644 index 00000000..7dcbe363 Binary files /dev/null and b/trunk/images/default/puce.png differ diff --git a/trunk/templates/images/refresh.png b/trunk/images/default/refresh.png similarity index 100% rename from trunk/templates/images/refresh.png rename to trunk/images/default/refresh.png diff --git a/trunk/templates/images/remove.png b/trunk/images/default/remove.png similarity index 100% rename from trunk/templates/images/remove.png rename to trunk/images/default/remove.png diff --git a/trunk/templates/images/rss.png b/trunk/images/default/rss.png similarity index 100% rename from trunk/templates/images/rss.png rename to trunk/images/default/rss.png diff --git a/trunk/templates/images/url_add.png b/trunk/images/default/url_add.png similarity index 100% rename from trunk/templates/images/url_add.png rename to trunk/images/default/url_add.png diff --git a/trunk/templates/images/url_go.png b/trunk/images/default/url_go.png similarity index 100% rename from trunk/templates/images/url_go.png rename to trunk/images/default/url_go.png diff --git a/trunk/images/default/verify.png b/trunk/images/default/verify.png new file mode 100644 index 00000000..4c8204af Binary files /dev/null and b/trunk/images/default/verify.png differ diff --git a/trunk/templates/images/view.png b/trunk/images/default/view.png similarity index 100% rename from trunk/templates/images/view.png rename to trunk/images/default/view.png diff --git a/trunk/templates/images/xmpp.png b/trunk/images/default/xmpp.png similarity index 100% rename from trunk/templates/images/xmpp.png rename to trunk/images/default/xmpp.png diff --git a/trunk/templates/images/zoom.png b/trunk/images/default/zoom.png similarity index 100% rename from trunk/templates/images/zoom.png rename to trunk/images/default/zoom.png diff --git a/trunk/includes/class/class.LSformElement.php b/trunk/includes/class/class.LSformElement.php index acb58572..29fe9eaf 100644 --- a/trunk/includes/class/class.LSformElement.php +++ b/trunk/includes/class/class.LSformElement.php @@ -262,7 +262,7 @@ class LSformElement { */ function getMultipleData() { if ($this -> params['multiple'] == true ) { - return ""._("._("; + return ""._("._("; } else { return ''; diff --git a/trunk/includes/class/class.LSformElement_date.php b/trunk/includes/class/class.LSformElement_date.php index f793b216..36c1aba5 100644 --- a/trunk/includes/class/class.LSformElement_date.php +++ b/trunk/includes/class/class.LSformElement_date.php @@ -188,7 +188,7 @@ class LSformElement_date extends LSformElement { 'firstDayOfWeek' => $this -> getFirstDayOfWeek() ); $GLOBALS['LSsession'] -> addJSconfigParam($id,$params); - return ""._("; + return ""._("; } /** diff --git a/trunk/includes/class/class.LSformElement_password.php b/trunk/includes/class/class.LSformElement_password.php index 347072b6..cb33351f 100644 --- a/trunk/includes/class/class.LSformElement_password.php +++ b/trunk/includes/class/class.LSformElement_password.php @@ -82,17 +82,17 @@ class LSformElement_password extends LSformElement { } $class_txt="class='LSformElement_password_generate'"; $id = "LSformElement_password_generate_btn_".$this -> name."_".$numberId; - $autogenerate_html = "\n"; + $autogenerate_html = "\n"; } $id = "LSformElement_password_".$this -> name."_".$numberId; $return['html'] = "\n"; $return['html'] .= $autogenerate_html; $id = "LSformElement_password_view_btn_".$this -> name."_".$numberId; - $return['html'] .= "\n"; + $return['html'] .= "\n"; if (!$this -> attr_html -> attribute -> ldapObject-> isNew()) { $id = "LSformElement_password_verify_btn_".$this -> name."_".$numberId; - $return['html'] .= "\"".('Vérifier\n"; + $return['html'] .= "\"".('Vérifier\n"; } if (!empty($this -> values)) { diff --git a/trunk/includes/class/class.LSsession.php b/trunk/includes/class/class.LSsession.php index 18f1ba54..9504c955 100644 --- a/trunk/includes/class/class.LSsession.php +++ b/trunk/includes/class/class.LSsession.php @@ -80,6 +80,13 @@ class LSsession { if (loadDir($this -> confDir, '^config\..*\.php$')) { if ( include_once $GLOBALS['LSconfig']['Smarty'] ) { $GLOBALS['Smarty'] = new Smarty(); + $GLOBALS['Smarty'] -> template_dir = LS_TEMPLATES_DIR; + $GLOBALS['Smarty'] -> compile_dir = LS_TMP_DIR; + + $GLOBALS['Smarty'] -> assign('LS_CSS_DIR',LS_CSS_DIR); + $GLOBALS['Smarty'] -> assign('LS_IMAGES_DIR',LS_IMAGES_DIR); + + $this -> addJSconfigParam('LS_IMAGES_DIR',LS_IMAGES_DIR); return true; } else { @@ -838,7 +845,7 @@ class LSsession { /** * Ajoute une feuille de style au chargement de la page * - * Remarque : les scripts doivents être dans le dossiers templates/css/. + * Remarque : les scripts doivents être dans le dossier LS_CSS_DIR. * * @param[in] $script Le nom du fichier css à charger. * @@ -888,10 +895,10 @@ class LSsession { $GLOBALS['Smarty'] -> assign('LSsession_js',$JSscript_txt); // Css - $Css_txt="\n"; + $this -> addCssFile("LSdefault.css"); foreach ($this -> CssFiles as $file) { if (!$file['path']) { - $file['path']=LS_CSS_DIR; + $file['path']=LS_CSS_DIR.'/'; } $Css_txt.="\n"; } diff --git a/trunk/includes/js/LSdefault.js b/trunk/includes/js/LSdefault.js index 14cf8047..f522943e 100644 --- a/trunk/includes/js/LSdefault.js +++ b/trunk/includes/js/LSdefault.js @@ -163,6 +163,10 @@ var LSdefault = new Class({ this.displayError(error.toString()); } } + }, + + imagePath: function(image) { + return this.LSjsConfig['LS_IMAGES_DIR'] + '/' + image; } }); diff --git a/trunk/includes/js/LSformElement_boolean.js b/trunk/includes/js/LSformElement_boolean.js index 6bd68cec..7a8825c6 100644 --- a/trunk/includes/js/LSformElement_boolean.js +++ b/trunk/includes/js/LSformElement_boolean.js @@ -7,7 +7,7 @@ var LSformElement_boolean = new Class({ $$('li.LSformElement_boolean').each(function(el) { var btn = new Element('img'); btn.setProperties({ - src: 'templates/images/clear.png', + src: varLSdefault.imagePath('clear.png'), alt: 'Reset', title: 'Reset' }); diff --git a/trunk/includes/js/LSformElement_mail.js b/trunk/includes/js/LSformElement_mail.js index b3d797a4..9ab605e6 100644 --- a/trunk/includes/js/LSformElement_mail.js +++ b/trunk/includes/js/LSformElement_mail.js @@ -22,7 +22,7 @@ var LSformElement_mail = new Class({ addBtnAfter: function(el) { var btn = new Element('img'); btn.setProperties({ - src: 'templates/images/mail.png', + src: varLSdefault.imagePath('mail.png'), alt: 'Envoyer un mail', title: 'Envoyer un mail' }); diff --git a/trunk/includes/js/LSformElement_password.js b/trunk/includes/js/LSformElement_password.js index b1adf655..dd7dd583 100644 --- a/trunk/includes/js/LSformElement_password.js +++ b/trunk/includes/js/LSformElement_password.js @@ -50,7 +50,7 @@ var LSformElement_password = new Class({ if ( varLSdefault.checkAjaxReturn(data) ) { this.changeInputType($(data.fieldId),'text'); $(data.fieldId).value=data.generatePassword; - $(data.viewBtnId).setProperty('src','templates/images/hide.png'); + $(data.viewBtnId).setProperty('src',varLSdefault.imagePath('hide.png')); this.LSformElement_password_generate_inputHistory[data.fieldId]=data.generatePassword; } }, @@ -69,7 +69,7 @@ var LSformElement_password = new Class({ var getAttrNameAndId = /LSformElement_password_(.*)_([0-9]*)/ var attrNameAndId = getAttrNameAndId.exec(input.id); var viewBtnId = 'LSformElement_password_view_btn_' + attrNameAndId[1] + '_' + attrNameAndId[2]; - $(viewBtnId).setProperty('src','templates/images/view.png'); + $(viewBtnId).setProperty('src',varLSdefault.imagePath('view.png')); this.LSformElement_password_generate_inputHistory[input.id]=''; input.focus(); }, @@ -84,11 +84,11 @@ var LSformElement_password = new Class({ if (input.type=='password') { input = this.changeInputType(input,'text'); - img.setProperty('src','templates/images/hide.png'); + img.setProperty('src',varLSdefault.imagePath('hide.png')); } else { input = this.changeInputType(input,'password'); - img.setProperty('src','templates/images/view.png'); + img.setProperty('src',varLSdefault.imagePath('view.png')); } input.focus(); }, diff --git a/trunk/includes/js/LSformElement_rss.js b/trunk/includes/js/LSformElement_rss.js index c41df6dd..3423d62f 100644 --- a/trunk/includes/js/LSformElement_rss.js +++ b/trunk/includes/js/LSformElement_rss.js @@ -21,7 +21,7 @@ var LSformElement_rss = new Class({ addBtnAfter: function(el) { var btn = new Element('img'); btn.setProperties({ - src: 'templates/images/rss.png', + src: varLSdefault.imagePath('rss.png'), alt: 'File RSS', title: 'File RSS' }); diff --git a/trunk/includes/js/LSformElement_select.js b/trunk/includes/js/LSformElement_select.js index a79c318f..0a3e17a7 100644 --- a/trunk/includes/js/LSformElement_select.js +++ b/trunk/includes/js/LSformElement_select.js @@ -7,7 +7,7 @@ var LSformElement_select = new Class({ $$('select.LSform').each(function(el) { var btn = new Element('img'); btn.setProperties({ - src: 'templates/images/clear.png', + src: varLSdefault.imagePath('clear.png'), alt: 'Reset', title: 'Reset' }); diff --git a/trunk/includes/js/LSformElement_select_object_field.js b/trunk/includes/js/LSformElement_select_object_field.js index 835f054c..1858d986 100644 --- a/trunk/includes/js/LSformElement_select_object_field.js +++ b/trunk/includes/js/LSformElement_select_object_field.js @@ -21,7 +21,7 @@ var LSformElement_select_object_field = new Class({ var btn = new Element('img'); btn.addClass('btn'); btn.setProperties({ - src: 'templates/images/delete.png', + src: varLSdefault.imagePath('delete.png'), alt: this.params.deleteBtns }); btn.addEvent('click',this.LSformElement_select_object_deleteBtn.bind(this,btn)); @@ -53,7 +53,7 @@ var LSformElement_select_object_field = new Class({ addSingleAddBtn: function(insideEl) { this.addBtn = new Element('img'); - this.addBtn.setProperty('src','templates/images/modify.png'); + this.addBtn.setProperty('src',varLSdefault.imagePath('modify.png')); this.addBtn.addClass('btn'); this.addBtn.addEvent('click',this.onLSformElement_select_object_addBtnClick.bindWithEvent(this)); this.addBtn.injectInside(insideEl); diff --git a/trunk/includes/js/LSformElement_text_field.js b/trunk/includes/js/LSformElement_text_field.js index d0eff62b..7f953082 100644 --- a/trunk/includes/js/LSformElement_text_field.js +++ b/trunk/includes/js/LSformElement_text_field.js @@ -20,7 +20,7 @@ var LSformElement_text_field = new Class({ // GenerateBtn this.generateBtn = new Element('img'); this.generateBtn.addClass('btn'); - this.generateBtn.src='templates/images/generate.png'; + this.generateBtn.src=varLSdefault.imagePath('generate.png'); this.generateBtn.addEvent('click',this.refreshValue.bind(this)); this.generateBtn.injectAfter(this.input); diff --git a/trunk/includes/js/LSformElement_url.js b/trunk/includes/js/LSformElement_url.js index 2d4584b1..afa359fa 100644 --- a/trunk/includes/js/LSformElement_url.js +++ b/trunk/includes/js/LSformElement_url.js @@ -21,7 +21,7 @@ var LSformElement_url = new Class({ addBtnAfter: function(el) { var btn_go = new Element('img'); btn_go.setProperties({ - src: 'templates/images/url_go.png', + src: varLSdefault.imagePath('url_go.png'), alt: 'Suivre le lien', title: 'Suivre le lien' }); @@ -31,7 +31,7 @@ var LSformElement_url = new Class({ var btn_fav = new Element('img'); btn_fav.setProperties({ - src: 'templates/images/url_add.png', + src: varLSdefault.imagePath('url_add.png'), alt: 'Ajouter aux favoris', title: 'Ajouter aux favoris' }); diff --git a/trunk/includes/js/LSformElement_xmpp.js b/trunk/includes/js/LSformElement_xmpp.js index d2e9ba5d..32a92ec0 100644 --- a/trunk/includes/js/LSformElement_xmpp.js +++ b/trunk/includes/js/LSformElement_xmpp.js @@ -21,7 +21,7 @@ var LSformElement_xmpp = new Class({ addBtnAfter: function(el) { var btn = new Element('img'); btn.setProperties({ - src: 'templates/images/xmpp.png', + src: varLSdefault.imagePath('xmpp.png'), alt: 'Chat', title: 'Chat' }); diff --git a/trunk/includes/js/LSrelation.js b/trunk/includes/js/LSrelation.js index dc2a38d8..2fee436c 100644 --- a/trunk/includes/js/LSrelation.js +++ b/trunk/includes/js/LSrelation.js @@ -21,7 +21,7 @@ var LSrelation = new Class({ this.deleteBtnId = 0; $$('a.LSrelation').each(function(a) { this.deleteBtn[this.deleteBtnId] = new Element('img'); - this.deleteBtn[this.deleteBtnId].src = 'templates/images/delete.png'; + this.deleteBtn[this.deleteBtnId].src = varLSdefault.imagePath('delete.png'); this.deleteBtn[this.deleteBtnId].setStyle('cursor','pointer'); this.deleteBtn[this.deleteBtnId].addClass('LSrelation-btn'); this.deleteBtn[this.deleteBtnId].addEvent('click',this.onDeleteBtnClick.bind(this,this.deleteBtn[this.deleteBtnId])); diff --git a/trunk/includes/js/LSview.js b/trunk/includes/js/LSview.js index 1ff699f1..242ca750 100644 --- a/trunk/includes/js/LSview.js +++ b/trunk/includes/js/LSview.js @@ -17,7 +17,7 @@ var LSview = new Class({ onTdLSobjectListNamesOver: function(td){ td.imgEdit = new Element('img'); - td.imgEdit.src = 'templates/images/view.png'; + td.imgEdit.src = varLSdefault.imagePath('view.png'); td.imgEdit.injectInside(td); }, diff --git a/trunk/templates/LSmail.tpl b/trunk/templates/default/LSmail.tpl similarity index 100% rename from trunk/templates/LSmail.tpl rename to trunk/templates/default/LSmail.tpl diff --git a/trunk/templates/LSrelations.tpl b/trunk/templates/default/LSrelations.tpl similarity index 83% rename from trunk/templates/LSrelations.tpl rename to trunk/templates/default/LSrelations.tpl index 4adbe81e..ed312385 100644 --- a/trunk/templates/LSrelations.tpl +++ b/trunk/templates/default/LSrelations.tpl @@ -2,7 +2,7 @@ {if $item.actions!=''} {/if} diff --git a/trunk/templates/accueil.tpl b/trunk/templates/default/accueil.tpl similarity index 100% rename from trunk/templates/accueil.tpl rename to trunk/templates/default/accueil.tpl diff --git a/trunk/templates/blank.tpl b/trunk/templates/default/blank.tpl similarity index 79% rename from trunk/templates/blank.tpl rename to trunk/templates/default/blank.tpl index f12a80f9..c0cb0b35 100644 --- a/trunk/templates/blank.tpl +++ b/trunk/templates/default/blank.tpl @@ -3,8 +3,8 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle}{/if} - - + + {$LSsession_css} {$LSsession_js} diff --git a/trunk/templates/bottom.tpl b/trunk/templates/default/bottom.tpl similarity index 100% rename from trunk/templates/bottom.tpl rename to trunk/templates/default/bottom.tpl diff --git a/trunk/templates/create.tpl b/trunk/templates/default/create.tpl similarity index 74% rename from trunk/templates/create.tpl rename to trunk/templates/default/create.tpl index 5e71e973..7f2e9c55 100644 --- a/trunk/templates/create.tpl +++ b/trunk/templates/default/create.tpl @@ -5,7 +5,7 @@ {$LSform_header}
{foreach from=$LSform_fields item=field} -
{$field.label}{if $field.help_info!=""} ?{/if}
+
{$field.label}{if $field.required} *{/if}{if $field.help_info!=""} ?{/if}
{$field.html}{if $field.add != ''} + Ajouter un champ{/if}
{if $field.errors != ''} {foreach from=$field.errors item=error} diff --git a/trunk/templates/empty.tpl b/trunk/templates/default/empty.tpl similarity index 100% rename from trunk/templates/empty.tpl rename to trunk/templates/default/empty.tpl diff --git a/trunk/templates/login.tpl b/trunk/templates/default/login.tpl similarity index 93% rename from trunk/templates/login.tpl rename to trunk/templates/default/login.tpl index 46d13877..3196337c 100644 --- a/trunk/templates/login.tpl +++ b/trunk/templates/default/login.tpl @@ -4,7 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle}{/if} - + {$LSsession_css} {$LSsession_js} @@ -18,7 +18,7 @@
{if $LSdebug != ''}{$LSdebug}{/if}
- +
diff --git a/trunk/templates/modify.tpl b/trunk/templates/default/modify.tpl similarity index 80% rename from trunk/templates/modify.tpl rename to trunk/templates/default/modify.tpl index 6258a25b..79e50ecf 100644 --- a/trunk/templates/modify.tpl +++ b/trunk/templates/default/modify.tpl @@ -3,7 +3,7 @@ {if $LSview_actions != ''} {/if} @@ -12,9 +12,9 @@
{if $LSformElement_image_actions!='' && !$LSformElement_image_errors}
    -
    • +
    • {foreach from=$LSformElement_image_actions item=item} -
    • +
    • {/foreach}
{/if} @@ -26,7 +26,7 @@ {$LSform_header}
{foreach from=$LSform_fields item=field} -
{$field.label}{if $field.help_info!=""} ?{/if}
+
{$field.label}{if $field.required} *{/if}{if $field.help_info!=""} ?{/if}
{$field.html}{if $field.add != ''} + Ajouter un champ{/if}
{if $field.errors != ''} {foreach from=$field.errors item=error} diff --git a/trunk/templates/question.tpl b/trunk/templates/default/question.tpl similarity index 76% rename from trunk/templates/question.tpl rename to trunk/templates/default/question.tpl index 1fd13cf7..e8b0306a 100644 --- a/trunk/templates/question.tpl +++ b/trunk/templates/default/question.tpl @@ -3,7 +3,7 @@ {if $LSview_actions != ''}

{foreach from=$LSview_actions item=item} - {$item.label} + {$item.label} {/foreach}

{/if} diff --git a/trunk/templates/recoverpassword.tpl b/trunk/templates/default/recoverpassword.tpl similarity index 91% rename from trunk/templates/recoverpassword.tpl rename to trunk/templates/default/recoverpassword.tpl index 2ebe2057..e79951d4 100644 --- a/trunk/templates/recoverpassword.tpl +++ b/trunk/templates/default/recoverpassword.tpl @@ -4,7 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle}{/if} - + {$LSsession_css} {$LSsession_js} @@ -17,7 +17,7 @@
{if $LSdebug != ''}{$LSdebug}{/if}
- +
diff --git a/trunk/templates/redirect.tpl b/trunk/templates/default/redirect.tpl similarity index 100% rename from trunk/templates/redirect.tpl rename to trunk/templates/default/redirect.tpl diff --git a/trunk/templates/select.tpl b/trunk/templates/default/select.tpl similarity index 96% rename from trunk/templates/select.tpl rename to trunk/templates/default/select.tpl index 089b7ec2..800acdbb 100644 --- a/trunk/templates/select.tpl +++ b/trunk/templates/default/select.tpl @@ -18,7 +18,7 @@
- {$_refresh} + {$_refresh}

diff --git a/trunk/templates/select_table.tpl b/trunk/templates/default/select_table.tpl similarity index 94% rename from trunk/templates/select_table.tpl rename to trunk/templates/default/select_table.tpl index 5c4e607a..695c170e 100644 --- a/trunk/templates/select_table.tpl +++ b/trunk/templates/default/select_table.tpl @@ -1,8 +1,8 @@ - - {if $LSobject_list_subDn}{/if} + + {if $LSobject_list_subDn}{/if} {assign var='bis' value=false} {foreach from=$LSobject_list item=object} diff --git a/trunk/templates/top.tpl b/trunk/templates/default/top.tpl similarity index 76% rename from trunk/templates/top.tpl rename to trunk/templates/default/top.tpl index 1e9ff81b..f6e5ed1b 100644 --- a/trunk/templates/top.tpl +++ b/trunk/templates/default/top.tpl @@ -4,8 +4,8 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle}{/if} - - + + {$LSsession_css} {$LSsession_js} @@ -24,12 +24,12 @@
- + {if $LSsession_subDn!=""}
{if $LSobject_list_orderby == 'displayValue'}{$LSobject_list_objectname}{$LSobject_list_ordersense}{else}{$LSobject_list_objectname}{/if}{if $LSobject_list_orderby == 'subDn'}{$label_level}{$LSobject_list_ordersense}{else}{$label_level}{/if}{if $LSobject_list_orderby == 'displayValue'}{$LSobject_list_objectname}{$LSobject_list_ordersense}{else}{$LSobject_list_objectname}{/if}{if $LSobject_list_orderby == 'subDn'}{$label_level}{$LSobject_list_ordersense}{else}{$label_level}{/if}
- - {if $LSobject_list_subDn}{/if} + + {if $LSobject_list_subDn}{/if} {assign var='bis' value=false} @@ -36,7 +36,7 @@
{if $LSobject_list_orderby == 'displayValue'}{$LSobject_list_objectname}{$LSobject_list_ordersense}{else}{$LSobject_list_objectname}{/if}{if $LSobject_list_orderby == 'subDn'}{$label_level}{$LSobject_list_ordersense}{else}{$label_level}{/if}{if $LSobject_list_orderby == 'displayValue'}{$LSobject_list_objectname}{$LSobject_list_ordersense}{else}{$LSobject_list_objectname}{/if}{if $LSobject_list_orderby == 'subDn'}{$label_level}{$LSobject_list_ordersense}{else}{$label_level}{/if}{$_Actions}
{if $object.actions!=''} {foreach from=$object.actions item=item} - {$item.label} + {$item.label} {/foreach} {/if}