rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 22:22:26 +00:00
Code Issues Releases Wiki Activity

Utilisation du packet debian pour bootstrap

Browse source
This commit is contained in:
Hugo LEVY-FALK 2018-05-12 22:11:14 +02:00
parent dc999b80b5
commit de75e7bb27
4 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -3,9 +3,11 @@ Datepicker
Install libjs-jquery Install libjs-jquery
Install libjs-jquery-ui Install libjs-jquery-ui
Install libjs-jquery-timepicker Install libjs-jquery-timepicker
Install libjs-bootstrap
Install (if not) javascript-common Install (if not) javascript-common
Enable (if not) javascript-common conf Enable (if not) javascript-common conf
Delete old jquery files : Delete old jquery files :
rm -rf static_files/js/jquery-ui-* rm -rf static_files/js/jquery-ui-*
rm -rf static_files/js/jquery-2.2.4.min.js rm -rf static_files/js/jquery-2.2.4.min.js
static/css/jquery-ui-timepicker-addon.css

1
install_re2o.sh
View file

@ -432,6 +432,7 @@ end=$(dialog --clear \
apt install libjs-jquery apt install libjs-jquery
apt install libjs-jquery-ui apt install libjs-jquery-ui
apt install libjs-jquery-timepicker apt install libjs-jquery-timepicker
apt install libjs-bootstrap
main_function() { main_function() {
if [ ! -z "$1" ] if [ ! -z "$1" ]

4
re2o/settings.py
View file

@ -150,10 +150,10 @@ DATABASE_ROUTERS = ['ldapdb.router.Router']
# django-bootstrap3 config # django-bootstrap3 config
BOOTSTRAP3 = { BOOTSTRAP3 = {
'jquery_url': '/javascript/jquery/jquery.min.js', 'jquery_url': '/javascript/jquery/jquery.min.js',
'base_url': '/static/bootstrap/', 'base_url': '/javascript/bootstrap/',
'include_jquery': True, 'include_jquery': True,
} }
BOOTSTRAP_BASE_URL = '/static/bootstrap/' BOOTSTRAP_BASE_URL = '/javascript/bootstrap/'
# Directories where collectstatic should look for static files # Directories where collectstatic should look for static files
# Use only absolute paths with '/' delimiters even on Windows # Use only absolute paths with '/' delimiters even on Windows

30
static/css/jquery-ui-timepicker-addon.css
View file

@ -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; }