Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
de75e7bb
Commit
de75e7bb
authored
May 12, 2018
by
Hugo LEVY-FALK
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Utilisation du packet debian pour bootstrap
parent
dc999b80
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
32 deletions
+5
-32
CHANGELOG.md
CHANGELOG.md
+2
-0
install_re2o.sh
install_re2o.sh
+1
-0
re2o/settings.py
re2o/settings.py
+2
-2
static/css/jquery-ui-timepicker-addon.css
static/css/jquery-ui-timepicker-addon.css
+0
-30
No files found.
CHANGELOG.md
View file @
de75e7bb
...
...
@@ -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
install_re2o.sh
View file @
de75e7bb
...
...
@@ -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
"
]
...
...
re2o/settings.py
View file @
de75e7bb
...
...
@@ -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
...
...
static/css/jquery-ui-timepicker-addon.css
deleted
100644 → 0
View file @
dc999b80
.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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment