Permalink
Browse files

Merge pull request #37 from el-cms/feature/comments

Feature/comments
  • Loading branch information...
mtancoigne committed Sep 11, 2016
2 parents 222db47 + 1cf0fc9 commit 98da9c1282992e3d4b86ca1cef5e7a8500981b3c
Showing with 2,334 additions and 492 deletions.
  1. +2 −8 .gitignore
  2. +40 −0 Sources/Sass/_custom_bootflat.scss
  3. +50 −0 Sources/Sass/_custom_bootstrap.scss
  4. +17 −0 Sources/Sass/_custom_fa.sass
  5. 0 Sources/Sass/{common/custom → }/addons/_codemirror.scss
  6. +0 −2 Sources/Sass/backend/README.md
  7. +0 −16 Sources/Sass/backend/base/_tables.scss
  8. +0 −7 Sources/Sass/backend/components/_navs.scss
  9. +0 −8 Sources/Sass/backend/variables/_colours.scss
  10. +0 −54 Sources/Sass/common/_common.scss
  11. +0 −40 Sources/Sass/common/_custom_bootflat.scss
  12. +0 −50 Sources/Sass/common/_custom_bootstrap.scss
  13. 0 Sources/Sass/{common/custom → }/components/_alerts.scss
  14. 0 Sources/Sass/{common/custom → }/components/_breadcrumbs.scss
  15. 0 Sources/Sass/{common/custom → }/components/_cards.scss
  16. 0 Sources/Sass/{common/custom → }/components/_cow.scss
  17. 0 Sources/Sass/{common/custom → }/components/_empty.scss
  18. 0 Sources/Sass/{common/custom → }/components/_events.scss
  19. +730 −0 Sources/Sass/components/_fa_icons.scss
  20. 0 Sources/Sass/{common/custom → }/components/_labels.scss
  21. 0 Sources/Sass/{common/custom → }/components/_list-group.scss
  22. 0 Sources/Sass/{common/custom → }/components/_navbar.scss
  23. 0 Sources/Sass/{common/custom → }/components/_page-loader.scss
  24. 0 Sources/Sass/{common/custom → }/components/_pagination.scss
  25. 0 Sources/Sass/{common/custom → }/components/_tiles.scss
  26. 0 Sources/Sass/{common/custom → }/components/_timeline.scss
  27. 0 Sources/Sass/{common/custom → }/components/_toolbars.scss
  28. 0 Sources/Sass/{common/custom → }/core/_forms.scss
  29. 0 Sources/Sass/{common/custom → }/core/_scaffolding.scss
  30. 0 Sources/Sass/{common/custom → }/core/_type.scss
  31. 0 Sources/Sass/{common/custom → }/core/_variables.scss
  32. +0 −27 Sources/Sass/frontend.scss
  33. +0 −2 Sources/Sass/frontend/README.md
  34. +0 −3 Sources/Sass/frontend/base/_typo.scss
  35. +0 −30 Sources/Sass/frontend/components/_cards.scss
  36. +0 −17 Sources/Sass/frontend/components/_lists.scss
  37. +0 −12 Sources/Sass/frontend/components/_rendered-mdown.scss
  38. +0 −18 Sources/Sass/frontend/components/_tiles.scss
  39. 0 Sources/Sass/{common/custom/jscomponents/_accordions.scss → jscomponents/_accordion.scss}
  40. +1 −5 Sources/Sass/koala-config.json
  41. +24 −9 Sources/Sass/setup.sh
  42. +54 −0 Sources/Sass/style.scss
  43. +297 −117 clover.xml
  44. +91 −0 config/Migrations/20160906135045_CreateComments.php
  45. BIN config/Migrations/schema-dump-default.lock
  46. +7 −4 setup.sh
  47. +1 −0 src/Console/Installer.php
  48. +97 −0 src/Controller/CommentsController.php
  49. +82 −0 src/Controller/User/CommentsController.php
  50. +95 −22 src/Locale/elabs.pot
  51. BIN src/Locale/fr_FR/elabs.mo
  52. +102 −31 src/Locale/fr_FR/elabs.po
  53. +40 −0 src/Model/Entity/Comment.php
  54. +107 −0 src/Model/Table/CommentsTable.php
  55. +46 −0 src/Template/Cell/Comments/add_form.ctp
  56. +71 −0 src/Template/Element/comments/card.ctp
  57. +36 −0 src/Template/Element/layout/mainmenu_user.ctp
  58. +3 −0 src/Template/Element/layout/mainmenu_usermenu.ctp
  59. +2 −0 src/Template/Files/view.ctp
  60. +1 −1 src/Template/Layout/admin.ctp
  61. +1 −1 src/Template/Layout/default.ctp
  62. +2 −2 src/Template/Layout/user.ctp
  63. +2 −0 src/Template/Notes/view.ctp
  64. +2 −0 src/Template/Posts/view.ctp
  65. +2 −0 src/Template/Projects/view.ctp
  66. +36 −0 src/Template/User/Comments/index.ctp
  67. +28 −0 src/View/Cell/CommentsCell.php
  68. +7 −4 src/View/Helper/AppHtmlHelper.php
  69. +63 −0 tests/Fixture/CommentsFixture.php
  70. +1 −0 tests/TestCase/Controller/FilesControllerTest.php
  71. +1 −0 tests/TestCase/Controller/NotesControllerTest.php
  72. +1 −0 tests/TestCase/Controller/PostsControllerTest.php
  73. +1 −0 tests/TestCase/Controller/ProjectsControllerTest.php
  74. +93 −0 tests/TestCase/Model/Table/CommentsTableTest.php
  75. +95 −0 update.sh
  76. +1 −0 webroot/css/{frontend.css → style.css}
  77. +2 −2 webroot/css/{frontend.css.map → style.css.map}
View
@@ -5,19 +5,13 @@
/logs/*
# Upload dir
/webroot/uploads/thumbs
/webroot/uploads/20*
/webroot/uploads
# Netbeans IDE project dir
/nbproject/private/
# Sass external sources
/Sources/Sass/common/bootstrap-sass
/Sources/Sass/common/bootstrap-tagsinput-latest
/Sources/Sass/common/bootstrap-datetimepicker-master
/Sources/Sass/common/bootflat.github.io-master
/Sources/Sass/common/Font-Awesome-master
/Sources/Sass/common/codemirror
/Sources/Sass/lib
# .htaccess files
.htaccess
@@ -0,0 +1,40 @@
@charset "UTF-8";
@import
// Variables, Extends, Mixins
"lib/bootflat.github.io-master/bootflat/scss/bootflat/global",
// Base
"lib/bootflat.github.io-master/bootflat/scss/bootflat/typography",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/button",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/button_group",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/label_badge",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/tooltip",*/
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/popover",*/
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/progress",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/breadcrumb",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/pagination",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/pager",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/form",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/stepper",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/selecter",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/checkbox_radio",*/
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/toggle",*/
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/calendar",*/
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/pricing",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/alert",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/tab",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/pill",*/
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/navbar",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/list",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/media_list",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/modal",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/well",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/thumbnail",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/jumbotron",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/panel",
/*"lib/bootflat.github.io-master/bootflat/scss/bootflat/accordion",*/
"lib/bootflat.github.io-master/bootflat/scss/bootflat/footer",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/timeline",
"lib/bootflat.github.io-master/bootflat/scss/bootflat/dropdown";
@@ -0,0 +1,50 @@
// Core variables and mixins
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
// Reset and dependencies
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/print";
// @import "lib/bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
// Core CSS
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/buttons";
// Components
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/pagination";
/*@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/pager";*/
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/badges";
/*@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";*/
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/alerts";
/*@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";*/
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/close";
// Components w/ JavaScript
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/modals";
/*@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/tooltip";*/
/*@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/popovers";*/
/*@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/carousel";*/
// Utility classes
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "lib/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@@ -0,0 +1,17 @@
/*
Font awesome overrides.
*/
@import "lib/Font-Awewome-master/scss/variables";
@import "lib/Font-Awewome-master/scss/mixins";
@import "lib/Font-Awewome-master/scss/path";
@import "lib/Font-Awewome-master/scss/core";
@import "lib/Font-Awewome-master/scss/larger";
@import "lib/Font-Awewome-master/scss/fixed-width";
@import "lib/Font-Awewome-master/scss/list";
@import "lib/Font-Awewome-master/scss/bordered-pulled";
@import "lib/Font-Awewome-master/scss/animated";
@import "lib/Font-Awewome-master/scss/rotated-flipped";
@import "lib/Font-Awewome-master/scss/stacked";
@import "components/fa_icons";
@import "lib/Font-Awewome-master/scss/screen-reader";
@@ -1,2 +0,0 @@
# Backend
This dir should contain all the Sass files for the backend
@@ -1,16 +0,0 @@
@each $color in $palette-list-class {
$i: index($palette-list-class, $color);
tr.line-#{$color} {
background-color: nth($palette-list-color, $i);
color: nth($palette-list-text, $i);
a,
a:focus,
a:hover {
color: inherit;
}
&:hover{
background-color: lighten(nth($palette-list-color, $i),10%) !important;
}
}
}
@@ -1,7 +0,0 @@
ul .side-nav-links, .side-nav{
list-style-type:none;
}
ul.side-nav{
margin:0px;
padding:0px;
}
@@ -1,8 +0,0 @@
// Extending the color list:
$palette-list-class: append($palette-list-class, "grey");
$palette-list-color: append($palette-list-color, $palette-grey-500);
$palette-list-dark: append($palette-list-dark, $palette-grey-700);
$palette-list-light: append($palette-list-light, $palette-grey-300);
$palette-list-text: append($palette-list-text, $black-text);
$palette-list-text-dark: append($palette-list-text-dark, $black-text);
$palette-list-text-light: append($palette-list-text-light, $black-text);
@@ -1,54 +0,0 @@
//
// Files common to both backend and frontend
// -----------------------------------------
// Variables, can't be variations of the bootstrap variables as loaded first
@import "custom/core/variables.scss";
// Base from Bootstrap
@import "custom_bootstrap.scss";
// Theme
@import "custom_bootflat.scss";
// Font-Awesome
@import "Font-Awesome-master/scss/font-awesome.scss";
// Overrides
// ---------
// Core variables and mixins
// Reset and dependencies
// Core CSS
@import "custom/core/scaffolding";
@import "custom/core/forms";
@import "custom/core/type.scss";
// Components
@import "custom/components/events";
@import "custom/components/breadcrumbs";
@import "custom/components/labels";
@import "custom/components/navbar";
@import "custom/components/pagination";
@import "custom/components/alerts";
@import "custom/components/list-group";
// Components w/ JavaScript
@import "custom/jscomponents/accordions";
// Utility classes
// Elabs-specific components and theme overrides
// ---------------------------------------------
@import "custom/components/cow.scss";
@import "custom/components/tiles.scss";
@import "custom/components/cards.scss";
@import "custom/components/timeline.scss";
@import "custom/components/page-loader.scss";
@import "custom/components/toolbars.scss";
@import "custom/components/empty.scss";
// Shared addons
// -------------
@import "custom/addons/codemirror.scss";
@@ -1,40 +0,0 @@
@charset "UTF-8";
@import
// Variables, Extends, Mixins
"bootflat.github.io-master/bootflat/scss/bootflat/global",
// Base
"bootflat.github.io-master/bootflat/scss/bootflat/typography",
"bootflat.github.io-master/bootflat/scss/bootflat/button",
"bootflat.github.io-master/bootflat/scss/bootflat/button_group",
"bootflat.github.io-master/bootflat/scss/bootflat/label_badge",
/*"bootflat.github.io-master/bootflat/scss/bootflat/tooltip",*/
/*"bootflat.github.io-master/bootflat/scss/bootflat/popover",*/
/*"bootflat.github.io-master/bootflat/scss/bootflat/progress",*/
"bootflat.github.io-master/bootflat/scss/bootflat/breadcrumb",
"bootflat.github.io-master/bootflat/scss/bootflat/pagination",
"bootflat.github.io-master/bootflat/scss/bootflat/pager",
"bootflat.github.io-master/bootflat/scss/bootflat/form",
/*"bootflat.github.io-master/bootflat/scss/bootflat/stepper",*/
"bootflat.github.io-master/bootflat/scss/bootflat/selecter",
/*"bootflat.github.io-master/bootflat/scss/bootflat/checkbox_radio",*/
/*"bootflat.github.io-master/bootflat/scss/bootflat/toggle",*/
/*"bootflat.github.io-master/bootflat/scss/bootflat/calendar",*/
/*"bootflat.github.io-master/bootflat/scss/bootflat/pricing",*/
"bootflat.github.io-master/bootflat/scss/bootflat/alert",
"bootflat.github.io-master/bootflat/scss/bootflat/tab",
/*"bootflat.github.io-master/bootflat/scss/bootflat/pill",*/
/*"bootflat.github.io-master/bootflat/scss/bootflat/navbar",*/
"bootflat.github.io-master/bootflat/scss/bootflat/list",
/*"bootflat.github.io-master/bootflat/scss/bootflat/media_list",*/
"bootflat.github.io-master/bootflat/scss/bootflat/modal",
"bootflat.github.io-master/bootflat/scss/bootflat/well",
"bootflat.github.io-master/bootflat/scss/bootflat/thumbnail",
/*"bootflat.github.io-master/bootflat/scss/bootflat/jumbotron",*/
"bootflat.github.io-master/bootflat/scss/bootflat/panel",
/*"bootflat.github.io-master/bootflat/scss/bootflat/accordion",*/
"bootflat.github.io-master/bootflat/scss/bootflat/footer",
"bootflat.github.io-master/bootflat/scss/bootflat/timeline",
"bootflat.github.io-master/bootflat/scss/bootflat/dropdown";
@@ -1,50 +0,0 @@
// Core variables and mixins
@import "bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins";
// Reset and dependencies
@import "bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "bootstrap-sass/assets/stylesheets/bootstrap/print";
// @import "bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
// Core CSS
@import "bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "bootstrap-sass/assets/stylesheets/bootstrap/buttons";
// Components
@import "bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "bootstrap-sass/assets/stylesheets/bootstrap/pagination";
/*@import "bootstrap-sass/assets/stylesheets/bootstrap/pager";*/
@import "bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "bootstrap-sass/assets/stylesheets/bootstrap/badges";
/*@import "bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";*/
@import "bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "bootstrap-sass/assets/stylesheets/bootstrap/alerts";
/*@import "bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";*/
@import "bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "bootstrap-sass/assets/stylesheets/bootstrap/close";
// Components w/ JavaScript
@import "bootstrap-sass/assets/stylesheets/bootstrap/modals";
/*@import "bootstrap-sass/assets/stylesheets/bootstrap/tooltip";*/
/*@import "bootstrap-sass/assets/stylesheets/bootstrap/popovers";*/
/*@import "bootstrap-sass/assets/stylesheets/bootstrap/carousel";*/
// Utility classes
@import "bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
Oops, something went wrong.

0 comments on commit 98da9c1

Please sign in to comment.