Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
squareui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cubicweb
cubes
squareui
Commits
e388a69cb77f
Commit
e388a69cb77f
authored
10 years ago
by
Rémi Cardona
Browse files
Options
Downloads
Patches
Plain Diff
[basetemplates] Allow setting the number of columns in twbs layout
parent
785c1d5081cc
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
data/cubes.squareui.js
+2
-2
2 additions, 2 deletions
data/cubes.squareui.js
views/basetemplates.py
+5
-3
5 additions, 3 deletions
views/basetemplates.py
views/component.py
+3
-1
3 additions, 1 deletion
views/component.py
with
10 additions
and
6 deletions
data/cubes.squareui.js
+
2
−
2
View file @
e388a69c
...
...
@@ -17,8 +17,8 @@
var
$contentCol
=
$
(
'
#main-center
'
);
var
$asideCols
=
$
(
"
.cwjs-aside
"
);
if
(
$asideCols
.
length
)
{
var
collapsendContentClass
=
twbs_col_cls
+
(
12
-
$asideCols
.
length
*
3
);
var
fullContentClass
=
twbs_col_cls
+
12
;
var
collapsendContentClass
=
twbs_col_cls
+
(
twbs_grid_columns
-
$asideCols
.
length
*
3
);
var
fullContentClass
=
twbs_col_cls
+
twbs_grid_columns
;
var
displayAsideboxes
=
cw
.
cubes
.
squareui
.
getLocalData
(
'
asideboxes
'
);
if
(
toggle
===
undefined
)
{
displayAsideboxes
=
$asideCols
.
hasClass
(
'
hidden
'
);
...
...
This diff is collapsed.
Click to expand it.
views/basetemplates.py
+
5
−
3
View file @
e388a69c
...
...
@@ -27,6 +27,9 @@
basetemplates
.
TheMainTemplate
.
twbs_container_cls
=
'
container-fluid
'
basetemplates
.
TheMainTemplate
.
twbs_col_cls
=
'
col-xs-
'
# options which require recompiling bootstrap.css from source
basetemplates
.
TheMainTemplate
.
twbs_grid_columns
=
12
@monkeypatch
(
basetemplates
.
TheMainTemplate
)
def
call
(
self
,
view
):
...
...
@@ -30,7 +33,6 @@
@monkeypatch
(
basetemplates
.
TheMainTemplate
)
def
call
(
self
,
view
):
self
.
grid_nb_cols
=
12
self
.
set_request_content_type
()
self
.
template_header
(
self
.
content_type
,
view
)
self
.
template_page_content
(
view
)
...
...
@@ -70,5 +72,5 @@
right_boxes
=
list
(
self
.
_cw
.
vreg
[
'
ctxcomponents
'
].
poss_visible_objects
(
self
.
_cw
,
rset
=
self
.
cw_rset
,
view
=
view
,
context
=
'
right
'
))
nb_boxes
=
int
(
bool
(
left_boxes
))
+
int
(
bool
(
right_boxes
))
content_cols
=
12
content_cols
=
self
.
twbs_grid_columns
if
nb_boxes
:
...
...
@@ -74,5 +76,5 @@
if
nb_boxes
:
content_cols
=
self
.
grid_nb_col
s
-
(
3
*
nb_boxes
)
content_cols
=
self
.
twbs_grid_column
s
-
(
3
*
nb_boxes
)
self
.
nav_column
(
view
,
left_boxes
,
'
left
'
)
self
.
content_column
(
view
,
content_cols
)
self
.
nav_column
(
view
,
right_boxes
,
'
right
'
)
...
...
This diff is collapsed.
Click to expand it.
views/component.py
+
3
−
1
View file @
e388a69c
...
...
@@ -31,7 +31,9 @@
icon_css_cls
=
'
glyphicon glyphicon-align-justify
'
def
render
(
self
,
w
):
self
.
_cw
.
html_headers
.
define_var
(
'
twbs_col_cls
'
,
TheMainTemplate
.
twbs_col_cls
)
define_var
=
self
.
_cw
.
html_headers
.
define_var
define_var
(
'
twbs_col_cls
'
,
TheMainTemplate
.
twbs_col_cls
)
define_var
(
'
twbs_grid_columns
'
,
TheMainTemplate
.
twbs_grid_columns
)
w
(
u
'''
<button class=
"
btn btn-default navbar-btn
"
id=
"
cw-aside-toggle
"
onclick=
"
cw.cubes.squareui.toggleLeftColumn()
"
title=
"
%(label)s
"
>
<span class=
"
%(icon_class)s
"
></span>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment