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
B
bonita-ui-designer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
bonita
bonita-ui-designer
Commits
f23ddfd8
Commit
f23ddfd8
authored
Jan 08, 2016
by
Colin PUY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(editorHeader) rename editor menu-bar to editor header
parent
62038658
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
68 additions
and
71 deletions
+68
-71
frontend/app/js/editor/_.module.js
frontend/app/js/editor/_.module.js
+1
-1
frontend/app/js/editor/editor.html
frontend/app/js/editor/editor.html
+1
-1
frontend/app/js/editor/editor.less
frontend/app/js/editor/editor.less
+50
-0
frontend/app/js/editor/header/_.module.js
frontend/app/js/editor/header/_.module.js
+1
-1
frontend/app/js/editor/header/header.controller.js
frontend/app/js/editor/header/header.controller.js
+5
-5
frontend/app/js/editor/header/header.html
frontend/app/js/editor/header/header.html
+0
-0
frontend/app/js/editor/header/header.less
frontend/app/js/editor/header/header.less
+0
-54
frontend/app/js/editor/header/help-popup.html
frontend/app/js/editor/header/help-popup.html
+0
-0
frontend/app/js/editor/header/save-as-popup.controller.js
frontend/app/js/editor/header/save-as-popup.controller.js
+1
-1
frontend/app/js/editor/header/save-as-popup.html
frontend/app/js/editor/header/save-as-popup.html
+0
-0
frontend/app/js/routes.js
frontend/app/js/routes.js
+3
-3
frontend/app/less/main.less
frontend/app/less/main.less
+2
-1
frontend/test/unit/editor/menu-bar/menu-bar.controller.spec.js
...end/test/unit/editor/menu-bar/menu-bar.controller.spec.js
+4
-4
No files found.
frontend/app/js/editor/_.module.js
View file @
f23ddfd8
...
...
@@ -21,7 +21,7 @@
'
bonitasoft.designer.editor.data-panel
'
,
'
bonitasoft.designer.editor.palette
'
,
'
bonitasoft.designer.editor.properties-panel
'
,
'
bonitasoft.designer.editor.
menu-ba
r
'
,
'
bonitasoft.designer.editor.
heade
r
'
,
'
bonitasoft.designer.editor.whiteboard
'
,
'
bonitasoft.designer.assets
'
,
'
gettext
'
...
...
frontend/app/js/editor/editor.html
View file @
f23ddfd8
<
div
ui-view=
"menubar"
confirm-on-exit
confirm-data=
"page"
></div
>
<
header
ui-view=
"header"
confirm-on-exit
confirm-data=
"page"
></header
>
<div
class=
"content-wrapper"
>
<!-- Palette -->
...
...
frontend/app/js/editor/editor.less
0 → 100644
View file @
f23ddfd8
.content-wrapper {
position: absolute;
top: @nav-bar-height;
left: 0;
right: 0;
bottom: 0;
overflow: hidden;
}
.form-control.form-control--pagename {
width: 250px;
}
#editor-container {
position: absolute;
top: 0;
bottom: 0;
left: @sidebar-palette-width;
right: @sidebar-properties-default-width;
}
.Palette--closed + #editor-container{
left: @sidebar-palette-section-width;
}
.Palette--narrow + #editor-container{
left: @sidebar-palette-width--narrow;
}
.workspace {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
#editor {
overflow: auto;
background-color: rgba(239, 241, 245, 0.15);
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: @sidebar-data-default-height;
padding:0 2em;
}
frontend/app/js/editor/
menu-ba
r/_.module.js
→
frontend/app/js/editor/
heade
r/_.module.js
View file @
f23ddfd8
...
...
@@ -16,7 +16,7 @@
'
use strict
'
;
angular
.
module
(
'
bonitasoft.designer.editor.
menu-ba
r
'
,
[
angular
.
module
(
'
bonitasoft.designer.editor.
heade
r
'
,
[
'
bonitasoft.designer.common.repositories
'
,
'
gettext
'
,
'
ui.bootstrap
'
,
...
...
frontend/app/js/editor/
menu-bar/menu-ba
r.controller.js
→
frontend/app/js/editor/
header/heade
r.controller.js
View file @
f23ddfd8
...
...
@@ -2,7 +2,7 @@
'
use strict
'
;
class
MenuBa
rCtrl
{
class
EditorHeade
rCtrl
{
constructor
(
mode
,
artifact
,
artifactRepo
,
$uibModal
,
$stateParams
,
$state
,
$window
)
{
'
ngInject
'
;
this
.
mode
=
mode
;
...
...
@@ -24,7 +24,7 @@
saveAs
(
page
)
{
var
modalInstance
=
this
.
$uibModal
.
open
({
templateUrl
:
'
js/editor/
menu-ba
r/save-as-popup.html
'
,
templateUrl
:
'
js/editor/
heade
r/save-as-popup.html
'
,
controller
:
'
SaveAsPopUpController
'
,
controllerAs
:
'
ctrl
'
,
resolve
:
{
...
...
@@ -47,7 +47,7 @@
openHelp
()
{
this
.
$uibModal
.
open
({
templateUrl
:
'
js/editor/
menu-ba
r/help-popup.html
'
,
templateUrl
:
'
js/editor/
heade
r/help-popup.html
'
,
size
:
'
lg
'
,
resolve
:
{
pageEdition
:
()
=>
this
.
mode
===
'
page
'
...
...
@@ -64,7 +64,7 @@
}
angular
.
module
(
'
bonitasoft.designer.editor.
menu-ba
r
'
)
.
controller
(
'
MenuBarCtrl
'
,
MenuBa
rCtrl
);
.
module
(
'
bonitasoft.designer.editor.
heade
r
'
)
.
controller
(
'
EditorHeaderCtrl
'
,
EditorHeade
rCtrl
);
})();
frontend/app/js/editor/
menu-bar/menu-ba
r.html
→
frontend/app/js/editor/
header/heade
r.html
View file @
f23ddfd8
File moved
frontend/app/
less/edito
r.less
→
frontend/app/
js/editor/header/heade
r.less
View file @
f23ddfd8
...
...
@@ -92,57 +92,3 @@
color: @color-editor-header-placeholder;
}
}
.editor-title {
text-transform: capitalize;
}
.content-wrapper {
position: absolute;
top: @nav-bar-height;
left: 0;
right: 0;
bottom: 0;
overflow: hidden;
}
.form-control.form-control--pagename {
width: 250px;
}
#editor-container {
position: absolute;
top: 0;
bottom: 0;
left: @sidebar-palette-width;
right: @sidebar-properties-default-width;
}
.Palette--closed + #editor-container{
left: @sidebar-palette-section-width;
}
.Palette--narrow + #editor-container{
left: @sidebar-palette-width--narrow;
}
.workspace {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
#editor {
overflow: auto;
background-color: rgba(239, 241, 245, 0.15);
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: @sidebar-data-default-height;
padding:0 2em;
}
frontend/app/js/editor/
menu-ba
r/help-popup.html
→
frontend/app/js/editor/
heade
r/help-popup.html
View file @
f23ddfd8
File moved
frontend/app/js/editor/
menu-ba
r/save-as-popup.controller.js
→
frontend/app/js/editor/
heade
r/save-as-popup.controller.js
View file @
f23ddfd8
...
...
@@ -17,6 +17,6 @@
}
angular
.
module
(
'
bonitasoft.designer.editor.
menu-ba
r
'
)
.
module
(
'
bonitasoft.designer.editor.
heade
r
'
)
.
controller
(
'
SaveAsPopUpController
'
,
SaveAsPopUpController
);
})();
frontend/app/js/editor/
menu-ba
r/save-as-popup.html
→
frontend/app/js/editor/
heade
r/save-as-popup.html
View file @
f23ddfd8
File moved
frontend/app/js/routes.js
View file @
f23ddfd8
...
...
@@ -92,10 +92,10 @@
controller
:
'
DataCtrl
'
,
templateUrl
:
'
js/editor/data-panel/data.html
'
},
'
menuba
r@designer.page
'
:
{
controller
:
'
MenuBa
rCtrl
'
,
'
heade
r@designer.page
'
:
{
controller
:
'
EditorHeade
rCtrl
'
,
controllerAs
:
'
vm
'
,
templateUrl
:
'
js/editor/
menu-bar/menu-ba
r.html
'
templateUrl
:
'
js/editor/
header/heade
r.html
'
}
}
},
...
...
frontend/app/less/main.less
View file @
f23ddfd8
...
...
@@ -10,7 +10,6 @@
@import "forms";
@import "sidebar";
@import "palette";
@import "editor";
@import "bottom-panel";
@import "widget";
@import "preview";
...
...
@@ -19,7 +18,9 @@
@import "drop-row";
@import "alerts";
@import "modal";
@import "../js/editor/editor";
@import "../js/editor/properties-panel/properties-panel";
@import "../js/editor/header/header";
@import "file-upload";
@import "splitter";
@import "widget-editor";
...
...
frontend/test/unit/editor/menu-bar/menu-bar.controller.spec.js
View file @
f23ddfd8
...
...
@@ -5,7 +5,7 @@
describe
(
'
Menu bar controller
'
,
function
()
{
var
pageRepo
,
scope
,
controller
,
$q
,
$window
,
$uibModal
,
modalInstance
,
$stateParams
,
$state
;
beforeEach
(
angular
.
mock
.
module
(
'
bonitasoft.designer.editor.
menu-ba
r
'
,
'
mock.modal
'
));
beforeEach
(
angular
.
mock
.
module
(
'
bonitasoft.designer.editor.
heade
r
'
,
'
mock.modal
'
));
beforeEach
(
inject
(
function
(
$rootScope
,
$controller
,
_pageRepo_
,
_$q_
,
_$uibModal_
,
$modalInstance
,
_$state_
)
{
pageRepo
=
_pageRepo_
;
...
...
@@ -21,7 +21,7 @@
$state
=
_$state_
;
modalInstance
=
$modalInstance
.
fake
();
controller
=
$controller
(
'
MenuBa
rCtrl
'
,
{
controller
=
$controller
(
'
EditorHeade
rCtrl
'
,
{
$window
:
$window
,
selectedResolution
:
{},
$uibModal
:
$uibModal
,
...
...
@@ -66,7 +66,7 @@
controller
.
openHelp
();
expect
(
$uibModal
.
open
).
toHaveBeenCalled
();
expect
(
$uibModal
.
open
.
calls
.
mostRecent
().
args
[
0
].
templateUrl
).
toEqual
(
'
js/editor/
menu-ba
r/help-popup.html
'
);
expect
(
$uibModal
.
open
.
calls
.
mostRecent
().
args
[
0
].
templateUrl
).
toEqual
(
'
js/editor/
heade
r/help-popup.html
'
);
expect
(
$uibModal
.
open
.
calls
.
mostRecent
().
args
[
0
].
size
).
toEqual
(
'
lg
'
);
});
...
...
@@ -79,7 +79,7 @@
controller
.
saveAs
(
page
);
expect
(
$uibModal
.
open
).
toHaveBeenCalled
();
expect
(
$uibModal
.
open
.
calls
.
mostRecent
().
args
[
0
].
templateUrl
).
toEqual
(
'
js/editor/
menu-ba
r/save-as-popup.html
'
);
expect
(
$uibModal
.
open
.
calls
.
mostRecent
().
args
[
0
].
templateUrl
).
toEqual
(
'
js/editor/
heade
r/save-as-popup.html
'
);
expect
(
$uibModal
.
open
.
calls
.
mostRecent
().
args
[
0
].
controller
).
toEqual
(
'
SaveAsPopUpController
'
);
modalInstance
.
close
(
page
);
...
...
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