diff --git a/CHANGELOG.md b/CHANGELOG.md index 3816d843..7c749362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ Datepicker Install libjs-jquery Install libjs-jquery-ui Install libjs-jquery-timepicker +Install libjs-bootstrap Install (if not) javascript-common Enable (if not) javascript-common conf Delete old jquery files : rm -rf static_files/js/jquery-ui-* rm -rf static_files/js/jquery-2.2.4.min.js + static/css/jquery-ui-timepicker-addon.css diff --git a/install_re2o.sh b/install_re2o.sh index fd9fad59..d755eb05 100755 --- a/install_re2o.sh +++ b/install_re2o.sh @@ -432,6 +432,7 @@ end=$(dialog --clear \ apt install libjs-jquery apt install libjs-jquery-ui apt install libjs-jquery-timepicker +apt install libjs-bootstrap main_function() { if [ ! -z "$1" ] diff --git a/re2o/settings.py b/re2o/settings.py index 1c5feecc..24226817 100644 --- a/re2o/settings.py +++ b/re2o/settings.py @@ -150,10 +150,10 @@ DATABASE_ROUTERS = ['ldapdb.router.Router'] # django-bootstrap3 config BOOTSTRAP3 = { 'jquery_url': '/javascript/jquery/jquery.min.js', - 'base_url': '/static/bootstrap/', + 'base_url': '/javascript/bootstrap/', 'include_jquery': True, } -BOOTSTRAP_BASE_URL = '/static/bootstrap/' +BOOTSTRAP_BASE_URL = '/javascript/bootstrap/' # Directories where collectstatic should look for static files # Use only absolute paths with '/' delimiters even on Windows diff --git a/static/css/jquery-ui-timepicker-addon.css b/static/css/jquery-ui-timepicker-addon.css deleted file mode 100644 index 95a22420..00000000 --- a/static/css/jquery-ui-timepicker-addon.css +++ /dev/null @@ -1,30 +0,0 @@ -.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } -.ui-timepicker-div dl { text-align: left; } -.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; } -.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; } -.ui-timepicker-div td { font-size: 90%; } -.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } -.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; } - -.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; } -.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; } - -.ui-timepicker-rtl{ direction: rtl; } -.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; } -.ui-timepicker-rtl dl dt{ float: right; clear: right; } -.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; } - -/* Shortened version style */ -.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; } -.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time, -.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; } -.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; } -.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; } -.ui-timepicker-div.ui-timepicker-oneLine dl dd, -.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; } -.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before, -.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; } -.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before, -.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; } -.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide, -.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; } \ No newline at end of file