# HG changeset patch # User nowmad@23.1.168.192.in-addr.arpa # Date 1446820629 -3600 # Node ID d4b3da0dadc9bd84a5f0dd441237862496893e89 # Parent f55970e41793930ab5e485edfbbda09db66eda58 init ember app with 2 pages and an images diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.bowerrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.bowerrc Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,4 @@ +{ + "directory": "bower_components", + "analytics": false +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.editorconfig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.editorconfig Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,34 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 + +[*.hbs] +insert_final_newline = false +indent_style = space +indent_size = 2 + +[*.css] +indent_style = space +indent_size = 2 + +[*.html] +indent_style = space +indent_size = 2 + +[*.{diff,md}] +trim_trailing_whitespace = false diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.ember-cli --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.ember-cli Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,9 @@ +{ + /** + Ember CLI sends analytics information by default. The data is completely + anonymous, but there are times when you might want to disable this behavior. + + Setting `disableAnalytics` to true will prevent any data from being sent. + */ + "disableAnalytics": false +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.gitignore Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,17 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp + +# dependencies +/node_modules +/bower_components + +# misc +/.sass-cache +/connect.lock +/coverage/* +/libpeerconnection.log +npm-debug.log +testem.log diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.jshintrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.jshintrc Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,32 @@ +{ + "predef": [ + "document", + "window", + "-Promise" + ], + "browser": true, + "boss": true, + "curly": true, + "debug": false, + "devel": true, + "eqeqeq": true, + "evil": true, + "forin": false, + "immed": false, + "laxbreak": false, + "newcap": true, + "noarg": true, + "noempty": false, + "nonew": false, + "nomen": false, + "onevar": false, + "plusplus": false, + "regexp": false, + "undef": true, + "sub": true, + "strict": false, + "white": false, + "eqnull": true, + "esnext": true, + "unused": true +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.travis.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.travis.yml Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,23 @@ +--- +language: node_js +node_js: + - "0.12" + +sudo: false + +cache: + directories: + - node_modules + +before_install: + - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH + - "npm config set spin false" + - "npm install -g npm@^2" + +install: + - npm install -g bower + - npm install + - bower install + +script: + - npm test diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/.watchmanconfig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/.watchmanconfig Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,3 @@ +{ + "ignore_dirs": ["tmp"] +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/README.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/README.md Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,53 @@ +# App-client + +This README outlines the details of collaborating on this Ember application. +A short introduction of this app could easily go here. + +## Prerequisites + +You will need the following things properly installed on your computer. + +* [Git](http://git-scm.com/) +* [Node.js](http://nodejs.org/) (with NPM) +* [Bower](http://bower.io/) +* [Ember CLI](http://www.ember-cli.com/) +* [PhantomJS](http://phantomjs.org/) + +## Installation + +* `git clone ` this repository +* change into the new directory +* `npm install` +* `bower install` + +## Running / Development + +* `ember server` +* Visit your app at [http://localhost:4200](http://localhost:4200). + +### Code Generators + +Make use of the many generators for code, try `ember help generate` for more details + +### Running Tests + +* `ember test` +* `ember test --server` + +### Building + +* `ember build` (development) +* `ember build --environment production` (production) + +### Deploying + +Specify what it takes to deploy your app. + +## Further Reading / Useful Links + +* [ember.js](http://emberjs.com/) +* [ember-cli](http://www.ember-cli.com/) +* Development Browser Extensions + * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi) + * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/) + diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/app.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/app.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,19 @@ +import Ember from 'ember'; +import Resolver from 'ember/resolver'; +import loadInitializers from 'ember/load-initializers'; +import config from './config/environment'; + +var App; + +Ember.MODEL_FACTORY_INJECTIONS = true; + +App = Ember.Application.extend({ + rootElement: config.rootElement, + modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix, + Resolver: Resolver +}); + +loadInitializers(App, config.modulePrefix); + +export default App; diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/components/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/controllers/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/controllers/second-page.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/controllers/second-page.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,8 @@ +import Ember from 'ember'; +import config from '../config/environment'; + +console.log(config); + +export default Ember.Controller.extend({ + logoUrl: config.baseStatic + "assets/images/logo.png" +}); diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/helpers/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/index.html Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,40 @@ + + + + + + AppClient + + + + {{content-for 'head'}} + + + + + + + {{content-for 'head-footer'}} + + +
+

Corpus de la parole

+ +
+ + {{content-for 'body'}} +
+ + + + + {{content-for 'body-footer'}} + + diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/models/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/router.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/router.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,13 @@ +import Ember from 'ember'; +import config from './config/environment'; + +var Router = Ember.Router.extend({ + location: config.locationType +}); + +Router.map(function() { + this.route('first-page'); + this.route('second-page'); +}); + +export default Router; diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/routes/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/styles/app.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/app.scss Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,10 @@ +#corpus-app { + border: 1px solid; + width: 940px; + height: 900px; + display: block; + margin-left: auto; + margin-right: auto; + margin-bottom: 10px; + +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/templates/application.hbs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/application.hbs Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,5 @@ +{{render 'header-nav'}} + +
+ {{outlet}} +
diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/templates/components/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/templates/first-page.hbs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/first-page.hbs Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,1 @@ +

This is a first page

diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/templates/header-nav.hbs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/header-nav.hbs Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,27 @@ + diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/templates/index.hbs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/index.hbs Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,1 @@ +

Welcome to CORPUS !

diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/app/templates/second-page.hbs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/templates/second-page.hbs Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,4 @@ +

This is a second page !

+

With a Logo !

+Logo +

{{ENV}}

diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/bower.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/bower.json Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,17 @@ +{ + "name": "app-client", + "dependencies": { + "ember": "1.13.7", + "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", + "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", + "ember-data": "1.13.8", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.4.9", + "ember-qunit-notifications": "0.0.7", + "ember-resolver": "~0.1.18", + "jquery": "^1.11.3", + "loader.js": "ember-cli/loader.js#3.2.1", + "qunit": "~1.18.0", + "bootstrap-sass": "~3.3.5" + } +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/config/environment.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/config/environment.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,43 @@ +/* jshint node: true */ + +module.exports = function(environment) { + var ENV = { + rootElement: '#corpus-app', + modulePrefix: 'app-client', + environment: environment, + baseURL: '/corpus', + locationType: 'auto', + APP: { + baseStatic: '', + // Here you can pass flags/options to your application instance + // when it is created + } + }; + + if (environment === 'development') { + ENV.baseStatic = ''; + // ENV.APP.LOG_RESOLVER = true; + // ENV.APP.LOG_ACTIVE_GENERATION = true; + // ENV.APP.LOG_TRANSITIONS = true; + // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; + // ENV.APP.LOG_VIEW_LOOKUPS = true; + } + + if (environment === 'test') { + // Testem prefers this... + ENV.baseURL = '/'; + ENV.locationType = 'none'; + + // keep test console output quieter + ENV.APP.LOG_ACTIVE_GENERATION = false; + ENV.APP.LOG_VIEW_LOOKUPS = false; + + ENV.APP.rootElement = '#ember-testing'; + } + + if (environment === 'production') { + ENV.APP.baseStatic = '/modules/corpus/app-client/'; + } + + return ENV; +}; diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/ember-cli-build.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/ember-cli-build.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,31 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-app'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // Add options here + sassOptions: { + includePaths: [ + 'bower_components/bootstrap-sass/assets/stylesheets/' + ] + }, + fingerprint: { + enabled: false + } + }); + + // Use `app.import` to add additional libraries to the generated + // output files. + // + // If you need to use different assets in different + // environments, specify an object as the first parameter. That + // object's keys should be the environment name and the values + // should be the asset to use in that environment. + // + // If the library that you are including contains AMD or ES6 + // modules that you would like to import into your application + // please specify an object with the list of modules as keys + // along with the exports of each module as its value. + + return app.toTree(); +}; diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/gulpfile.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/gulpfile.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,14 @@ +var gulp = require('gulp'), + rename = require('gulp-rename'); + +var buildFolder = './dist'; +var moduleFolder = '../corpus_module'; + +gulp.task('copy-module', function () { + gulp.src(buildFolder+'/assets/**/*') + .pipe(gulp.dest(moduleFolder+'/app-client/assets')); + gulp.src(buildFolder+'/fonts/**/*') + .pipe(gulp.dest(moduleFolder+'/app-client/fonts')); + gulp.src(moduleFolder+'/**/*') + .pipe(gulp.dest('../../../drupal-7.41/modules/corpus')); +}); diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/package.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/package.json Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,44 @@ +{ + "name": "app-client", + "version": "0.0.0", + "description": "Small description for app-client goes here", + "private": true, + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "module": "ember build --environment=production && gulp copy-module", + "build": "ember build --environment=production", + "start": "ember serve --environment=development", + "test": "ember test" + }, + "repository": "", + "engines": { + "node": ">= 0.10.0" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "broccoli-asset-rev": "^2.1.2", + "ember-cli": "1.13.8", + "ember-cli-app-version": "0.5.0", + "ember-cli-babel": "^5.1.3", + "ember-cli-content-security-policy": "0.4.0", + "ember-cli-dependency-checker": "^1.0.1", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.2.0", + "ember-cli-ic-ajax": "0.2.1", + "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-qunit": "^1.0.0", + "ember-cli-release": "0.2.3", + "ember-cli-sass": "5.0.1", + "ember-cli-sri": "^1.0.3", + "ember-cli-uglify": "^1.2.0", + "ember-data": "1.13.8", + "ember-disable-proxy-controllers": "^1.0.0", + "ember-export-application-global": "^1.0.3", + "gulp": "^3.9.0", + "gulp-rename": "^1.2.2" + } +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/public/assets/images/logo.png Binary file cms/app-client/public/assets/images/logo.png has changed diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/public/crossdomain.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/public/crossdomain.xml Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,15 @@ + + + + + + + + + + + diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/public/robots.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/public/robots.txt Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,3 @@ +# http://www.robotstxt.org +User-agent: * +Disallow: diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/public/styles.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/public/styles.css Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,66 @@ +body{ + margin: 0; +} +.header { + /*background-color: green;*/ + width: 940px; + height: 90px; + display: block; + margin-left: auto; + margin-right: auto; + margin-bottom: 1px; + padding-top: 20px; + border: 1px solid +} + +.header h1 { + font-size: x-large; + font-style: normal; + text-align: center; + font-weight: 800; + padding-left: 15px; + margin-bottom: 10px; + margin-top: 0; + color: darkorange; +} +div.menu { + float:right; + position:relative; + left:-50%; + text-align:left; + background-color: transparent; + border: none; +} + +ul.menu_main { + list-style:none; + position:relative; + left:50%; + padding: 0; + display: inline-block; + width: 100%; + float: none; + margin: 0 auto 0 auto; +} + +ul.menu_main li { + float: left; + list-style: none; + /*border-right: 1px solid #4f4f4f;*/ + position: relative; +} + +ul.menu_main li a { + color: darkorange; + display: block; + font-family: Arial; + font-size: 13px; + padding: 8px 20px 10px; + text-decoration: none; + /*border-right: 1px solid #2b2b2b;*/ +} + +ul.menu_main li a:hover { + font-weight: 900; + background-color: bisque; +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/testem.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/testem.json Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,12 @@ +{ + "framework": "qunit", + "test_page": "tests/index.html?hidepassed", + "disable_watching": true, + "launch_in_ci": [ + "PhantomJS" + ], + "launch_in_dev": [ + "PhantomJS", + "Chrome" + ] +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/tests/.jshintrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/.jshintrc Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,52 @@ +{ + "predef": [ + "document", + "window", + "location", + "setTimeout", + "$", + "-Promise", + "define", + "console", + "visit", + "exists", + "fillIn", + "click", + "keyEvent", + "triggerEvent", + "find", + "findWithAssert", + "wait", + "DS", + "andThen", + "currentURL", + "currentPath", + "currentRouteName" + ], + "node": false, + "browser": false, + "boss": true, + "curly": true, + "debug": false, + "devel": false, + "eqeqeq": true, + "evil": true, + "forin": false, + "immed": false, + "laxbreak": false, + "newcap": true, + "noarg": true, + "noempty": false, + "nonew": false, + "nomen": false, + "onevar": false, + "plusplus": false, + "regexp": false, + "undef": true, + "sub": true, + "strict": false, + "white": false, + "eqnull": true, + "esnext": true, + "unused": true +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/tests/helpers/resolver.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/helpers/resolver.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,11 @@ +import Resolver from 'ember/resolver'; +import config from '../../config/environment'; + +var resolver = Resolver.create(); + +resolver.namespace = { + modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix +}; + +export default resolver; diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/tests/helpers/start-app.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/helpers/start-app.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,18 @@ +import Ember from 'ember'; +import Application from '../../app'; +import config from '../../config/environment'; + +export default function startApp(attrs) { + var application; + + var attributes = Ember.merge({}, config.APP); + attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; + + Ember.run(function() { + application = Application.create(attributes); + application.setupForTesting(); + application.injectTestHelpers(); + }); + + return application; +} diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/tests/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/index.html Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,33 @@ + + + + + + AppClient Tests + + + + {{content-for 'head'}} + {{content-for 'test-head'}} + + + + + + {{content-for 'head-footer'}} + {{content-for 'test-head-footer'}} + + + + {{content-for 'body'}} + {{content-for 'test-body'}} + + + + + + + {{content-for 'body-footer'}} + {{content-for 'test-body-footer'}} + + diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/tests/test-helper.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/tests/test-helper.js Fri Nov 06 15:37:09 2015 +0100 @@ -0,0 +1,6 @@ +import resolver from './helpers/resolver'; +import { + setResolver +} from 'ember-qunit'; + +setResolver(resolver); diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/tests/unit/.gitkeep diff -r f55970e41793 -r d4b3da0dadc9 cms/app-client/vendor/.gitkeep