Branch: refs/heads/4.0.0
Home:
https://github.com/gatein/gatein-portal
Commit: 393c324fa096d988b0690e35fcd6d0a5a29904fc
https://github.com/gatein/gatein-portal/commit/393c324fa096d988b0690e35fc...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/layout/ZoneLayout.java
M portal/web/src/main/java/org/gatein/portal/package-info.java
M portal/web/src/main/java/org/gatein/portal/page/Controller.java
A portal/web/src/main/java/org/gatein/portal/page/Editor.java
M portal/web/src/main/java/org/gatein/portal/templates/shared.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/site.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_column.gtmpl
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/backbone.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/edit.js
A
portal/web/src/main/resources/org/gatein/portal/assets/javascripts/jquery-1.7.1.min.js
A
portal/web/src/main/resources/org/gatein/portal/assets/javascripts/jquery-ui-1.10.3.custom.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/underscore.js
Log Message:
-----------
prototype for edit page with JSON communication
Commit: 409677977a374b6b41f25198f86d4c1f65357ae7
https://github.com/gatein/gatein-portal/commit/409677977a374b6b41f25198f8...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M portal/web/pom.xml
M portal/web/src/main/java/org/gatein/portal/package-info.java
R portal/web/src/main/resources/org/gatein/portal/assets/javascripts/edit.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-editor.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-model.js
A portal/web/src/test/java/org/gatein/portal/page/EditorJSTestCase.java
A portal/web/src/test/java/org/gatein/qunit/FireFox.java
A portal/web/src/test/java/org/gatein/qunit/GateInQUnitRunner.java
A portal/web/src/test/java/org/gatein/qunit/GateInQUnitTestCase.java
A portal/web/src/test/resources/arquillian.xml
A portal/web/src/test/resources/assets/testJS/editorTest.html
A portal/web/src/test/resources/assets/testJS/editorTest.js
A portal/web/src/test/resources/assets/testJS/qunit.css
A portal/web/src/test/resources/assets/testJS/qunit.js
Log Message:
-----------
Add qunit test support and js unit test for page editor
Commit: ec1bd1dcaa7f973704d334b778b366cda54f3d5a
https://github.com/gatein/gatein-portal/commit/ec1bd1dcaa7f973704d334b778...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
R portal/web/src/test/java/org/gatein/qunit/FireFox.java
M portal/web/src/test/java/org/gatein/qunit/GateInQUnitTestCase.java
A portal/web/src/test/java/org/gatein/qunit/QUnitPage.java
R portal/web/src/test/resources/arquillian.xml
Log Message:
-----------
Use HtmlUnit to run QUnit test
Commit: 562d64bba539b4715972741cbbe76af8a00c733b
https://github.com/gatein/gatein-portal/commit/562d64bba539b4715972741cbb...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
R portal/web/src/main/java/org/gatein/portal/page/Editor.java
A portal/web/src/main/java/org/gatein/portal/page/PageEditor.java
M portal/web/src/main/java/org/gatein/portal/templates/shared.gtmpl
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-editor.js
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-model.js
Log Message:
-----------
small refactor
Commit: a8b91c7b1dc0013e1cc0cca02909710cfb081bce
https://github.com/gatein/gatein-portal/commit/a8b91c7b1dc0013e1cc0cca029...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
A portal/web/src/main/java/org/gatein/portal/assets/editor.css
M portal/web/src/main/java/org/gatein/portal/package-info.java
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_column.gtmpl
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-editor.js
Log Message:
-----------
Add some css when editing page
Commit: 26c97db26c9a6ad440e97521248ff789ef7c234a
https://github.com/gatein/gatein-portal/commit/26c97db26c9a6ad440e9752124...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M portal/web/pom.xml
M portal/web/src/test/java/org/gatein/portal/page/EditorJSTestCase.java
R portal/web/src/test/java/org/gatein/qunit/GateInQUnitRunner.java
R portal/web/src/test/java/org/gatein/qunit/GateInQUnitTestCase.java
R portal/web/src/test/java/org/gatein/qunit/QUnitPage.java
A portal/web/src/test/resources/assets/qunit/qunit.css
A portal/web/src/test/resources/assets/qunit/qunit.js
M portal/web/src/test/resources/assets/testJS/editorTest.html
M portal/web/src/test/resources/assets/testJS/editorTest.js
R portal/web/src/test/resources/assets/testJS/qunit.css
R portal/web/src/test/resources/assets/testJS/qunit.js
Log Message:
-----------
Rebase on gatein master, and use arquillian-qunit 1.0.0.Alpha1
Commit: 489f9720874181e32e2f9e7a447c113618595496
https://github.com/gatein/gatein-portal/commit/489f9720874181e32e2f9e7a44...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M portal/web/src/test/java/org/gatein/portal/JuzuPortletTestCase.java
Log Message:
-----------
Decouple portlet asset testcase from portal assets
Commit: 3a88d1fa30b5a1b10eaa6025d6b685eea1f7b39d
https://github.com/gatein/gatein-portal/commit/3a88d1fa30b5a1b10eaa6025d6...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/package-info.java
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-model.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
R portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-editor.js
R portal/web/src/main/resources/org/gatein/portal/assets/javascripts/page-model.js
R portal/web/src/test/java/org/gatein/portal/page/EditorJSTestCase.java
A portal/web/src/test/java/org/gatein/portal/page/LayoutEditorTest.java
A portal/web/src/test/resources/assets/testJS/LayoutEditorTest.html
A portal/web/src/test/resources/assets/testJS/LayoutEditorTest.js
R portal/web/src/test/resources/assets/testJS/editorTest.html
R portal/web/src/test/resources/assets/testJS/editorTest.js
Log Message:
-----------
New page editor layout model
Commit: c4cb0016419b8595cc9e2d30ab8beddd2cc8dbd0
https://github.com/gatein/gatein-portal/commit/c4cb0016419b8595cc9e2d30ab...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-model.js
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
M portal/web/src/test/resources/assets/testJS/LayoutEditorTest.js
Log Message:
-----------
Allow to build and generate json from JS page model
Commit: f3216de81a435229c7b0f493d32519d08ad170c5
https://github.com/gatein/gatein-portal/commit/f3216de81a435229c7b0f493d3...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/page/PageEditor.java
M portal/web/src/main/java/org/gatein/portal/templates/site.gtmpl
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
Log Message:
-----------
EXOGTN-1578 [Edit-Inplace] Implement save and cancel editing layout
Commit: cd245f23b0f9fe25fbca65a6ebb0b3b9cab567a7
https://github.com/gatein/gatein-portal/commit/cd245f23b0f9fe25fbca65a6eb...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/assets/editor.css
M portal/web/src/main/java/org/gatein/portal/layout/ZoneLayout.java
M portal/web/src/main/java/org/gatein/portal/package-info.java
M portal/web/src/main/java/org/gatein/portal/page/Controller.java
M portal/web/src/main/java/org/gatein/portal/page/PageEditor.java
M portal/web/src/main/java/org/gatein/portal/templates/site.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_column.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_70_30.gtmpl
A
portal/web/src/main/resources/org/gatein/portal/assets/javascripts/bootstrap-dropdown.js
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
Log Message:
-----------
Use layout two columns for parallel demo page
Commit: 24a85337990f8fe782340ff2b65b90bd2fca86b9
https://github.com/gatein/gatein-portal/commit/24a85337990f8fe782340ff2b6...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
Log Message:
-----------
fix small bug due to merging switching layout
Commit: e54a85957a36ba844f2b3a6fccabf552fb8751cd
https://github.com/gatein/gatein-portal/commit/e54a85957a36ba844f2b3a6fcc...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/layout/ZoneLayout.java
M portal/web/src/main/java/org/gatein/portal/layout/ZoneLayoutFactory.java
M portal/web/src/main/java/org/gatein/portal/page/PageEditor.java
M portal/web/src/main/java/org/gatein/portal/templates/site.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_column.gtmpl
A portal/web/src/main/java/org/gatein/portal/templates/zone_1_row_2_columns.gtmpl
A portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_1_row.gtmpl
A portal/web/src/main/java/org/gatein/portal/templates/zone_3_columns.gtmpl
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
Log Message:
-----------
Config some more complex layout
Commit: 4ca5f03f58c3b747ee37fa404eeef440f204b9eb
https://github.com/gatein/gatein-portal/commit/4ca5f03f58c3b747ee37fa404e...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/assets/editor.css
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_row_2_columns.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_1_row.gtmpl
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-model.js
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
Log Message:
-----------
Fix some typo on new layout template
Commit: 65e52b20cfd8c1813f2c1908d30b0e9688c1231f
https://github.com/gatein/gatein-portal/commit/65e52b20cfd8c1813f2c1908d3...
Author: nttuyen <tuyennt(a)exoplatform.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/page/PageEditor.java
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-model.js
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
Log Message:
-----------
EXOGTN-1578 [Edit-Inplace] - fixbug save when change layout
Commit: ec4aa188276e0d977b8f4c13ea5d582494df1f68
https://github.com/gatein/gatein-portal/commit/ec4aa188276e0d977b8f4c13ea...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M portal/web/src/main/java/org/gatein/portal/assets/editor.css
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_column.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_row_2_columns.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_1_row.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_70_30.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_3_columns.gtmpl
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-model.js
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
Log Message:
-----------
Make DnD better and some code refactoring
Commit: 0734420fc49f5a663893f19027b3ab099a4cfaa4
https://github.com/gatein/gatein-portal/commit/0734420fc49f5a663893f19027...
Author: nttuyen <tuyennt(a)exoplatform.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
Log Message:
-----------
EXOGTN-1578 [Edit-Inplace] - keep snapshot state when switch layout
Commit: f6dc7b5e728bbe667f83b1cae768ca9fd0ba2bb7
https://github.com/gatein/gatein-portal/commit/f6dc7b5e728bbe667f83b1cae7...
Author: Julien Viet <julien(a)julienviet.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
Log Message:
-----------
Use homepage portlet on layout demo instead of sleep portlet
Commit: bfbf84f3dc472afdc537d10ffa85af917be2f1be
https://github.com/gatein/gatein-portal/commit/bfbf84f3dc472afdc537d10ffa...
Author: Julien Viet <julien(a)julienviet.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M portal/web/pom.xml
A portal/web/src/main/java/org/gatein/portal/assets/editor.css
M portal/web/src/main/java/org/gatein/portal/layout/ZoneLayout.java
M portal/web/src/main/java/org/gatein/portal/layout/ZoneLayoutFactory.java
M portal/web/src/main/java/org/gatein/portal/package-info.java
M portal/web/src/main/java/org/gatein/portal/page/Controller.java
A portal/web/src/main/java/org/gatein/portal/page/PageEditor.java
M portal/web/src/main/java/org/gatein/portal/templates/shared.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/site.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_1_column.gtmpl
A portal/web/src/main/java/org/gatein/portal/templates/zone_1_row_2_columns.gtmpl
A portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_1_row.gtmpl
M portal/web/src/main/java/org/gatein/portal/templates/zone_2_columns_70_30.gtmpl
A portal/web/src/main/java/org/gatein/portal/templates/zone_3_columns.gtmpl
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/backbone.js
A
portal/web/src/main/resources/org/gatein/portal/assets/javascripts/bootstrap-dropdown.js
A
portal/web/src/main/resources/org/gatein/portal/assets/javascripts/jquery-1.7.1.min.js
A
portal/web/src/main/resources/org/gatein/portal/assets/javascripts/jquery-ui-1.10.3.custom.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-model.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/layout-view.js
A portal/web/src/main/resources/org/gatein/portal/assets/javascripts/underscore.js
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
M portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
M portal/web/src/test/java/org/gatein/portal/JuzuPortletTestCase.java
A portal/web/src/test/java/org/gatein/portal/page/LayoutEditorTest.java
A portal/web/src/test/resources/assets/qunit/qunit.css
A portal/web/src/test/resources/assets/qunit/qunit.js
A portal/web/src/test/resources/assets/testJS/LayoutEditorTest.html
A portal/web/src/test/resources/assets/testJS/LayoutEditorTest.js
Log Message:
-----------
Basic edit inline feature
Compare:
https://github.com/gatein/gatein-portal/compare/8a099e7353a3...bfbf84f3dc47