Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

This commit is contained in:
Lorenzo Giacomelli
2016-01-19 16:02:32 +01:00
18 changed files with 1247 additions and 3 deletions
+3 -3
View File
@@ -6,7 +6,7 @@ Creation Date: 13/gen/2016
GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "normalize.css");
// GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "jquery-ui-1.8.23.custom.css");
GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "jquery-ui.css");
GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "chosen.css");
@@ -19,7 +19,7 @@ GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "icons.css");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery-1.12.0.min.js");
// GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery-ui-1.8.23.custom.min.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery-ui.min.js");
// GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery.dataTables.min.js");
@@ -32,4 +32,4 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "datatables.min.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "init.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"ckeditor/ckeditor.js");
?>
?>
+6
View File
@@ -19,4 +19,10 @@ HTMLHelper::generateAdminHead();
?>
<div>
Benvenuto!
<form>
<input type="text" id="date"/>
</form>
<script type="text/javascript">
$("#date").datepicker({dateFormat: "dd-mm-yy"});
</script>
</div>
Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

+13
View File
File diff suppressed because one or more lines are too long
+1225
View File
File diff suppressed because it is too large Load Diff