Logout

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Contributing to Symphony
+
+This is a TL;DR version of the [complete contribution guide](https://github.com/symphonycms/symphony-2/wiki/Contributing-to-Symphony).
+
+The two most important things are [comments](https://github.com/symphonycms/symphony-2/wiki/Contributing-to-Symphony#commenting) and [https://github.com/symphonycms/symphony-2/wiki/Contributing-to-Symphony#code-style](code style).
+
+Please insure that any new method is properly documented and that the code style is respected.
+
+Thanks!
+
+- The Symphony Team
+
+### Legal
+
+This submitting your code to the community, you agree to release all copyrights on the code you submit.

ISSUE_TEMPLATE.md

@@ -0,0 +1,3 @@
+Affected Symphony version(s) :
+PHP version(s) :
+OS(es) :

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+Fix for #
+
+or
+
+Describe new feature here

README.markdown

@@ -8,6 +8,7 @@
 - Date: 08th February 2016
 - [Release notes](http://getsymphony.com/download/releases/version/2.6.7/)
 - [Github repository](https://github.com/symphonycms/symphony-2/tree/2.6.7)
+- [MIT Licence](https://github.com/symphonycms/symphony-2/blob/master/LICENCE)
 
 ## Contents
 

composer.json

@@ -15,6 +15,9 @@
       "issues": "https://github.com/symphonycms/symphony-2/issues",
       "wiki": "https://github.com/symphonycms/symphony-2/wiki"
     },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "2.*"
+    },
     "minimum-stability": "stable",
     "autoload": {
       "classmap": ["symphony/content", "symphony/lib", "symphony/template", "install"],

gruntfile.js

@@ -2,8 +2,23 @@
 module.exports = function (grunt) {
     'use strict';
 
+    // standardize EOL
+    grunt.util.linefeed = '\n';
+
     grunt.initConfig({
 
+        pkg: grunt.file.readJSON('package.json'),
+
+        meta: {
+            banner: '/*!\n * <%= pkg.title || pkg.name %> ' +
+                    ' v<%= pkg.version %>\n' +
+                    ' * commit <%= commitish %> -' +
+                    ' <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+                    ' <%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
+                    ' * Copyright (c) <%= grunt.template.today("yyyy") %>\n' +
+                    ' * License <%= pkg.license %>\n */\n'
+        },
+
         concat: {
             dist: {
                 files: {
@@ -52,6 +67,9 @@ module.exports = function (grunt) {
 
         csso: {
             styles: {
+                options: {
+                    banner: '<%= meta.banner %>'
+                },
                 files: {
                     'symphony/assets/css/symphony.min.css': [
                         'symphony/assets/css/symphony.min.css'
@@ -88,6 +106,7 @@ module.exports = function (grunt) {
         uglify: {
             scripts: {
                 options: {
+                    banner: '<%= meta.banner %>',
                     preserveComments: 'some'
                 },
                 files: {
@@ -101,6 +120,7 @@ module.exports = function (grunt) {
                         'symphony/assets/js/src/symphony.js',
                         'symphony/assets/js/src/symphony.affix.js',
                         'symphony/assets/js/src/symphony.collapsible.js',
+                        'symphony/assets/js/src/symphony.defaultvalue.js',
                         'symphony/assets/js/src/symphony.orderable.js',
                         'symphony/assets/js/src/symphony.selectable.js',
                         'symphony/assets/js/src/symphony.duplicator.js',
@@ -127,9 +147,35 @@ module.exports = function (grunt) {
             scripts: {
                 files: 'symphony/assets/js/src/*.js',
                 tasks: ['js']
+            },
+            php: {
+                files: ['symphony/**/*.php', 'install/**/*.php'],
+                tasks: ['php']
             }
-        }
+        },
 
+        phpcs: {
+            application: {
+                src: ['symphony/**/*.php', 'install/**/*.php', 'index.php']
+            },
+            options: {
+                bin: 'vendor/bin/phpcs',
+                standard: 'PSR1',
+                showSniffCodes: true,
+                tabWidth: 4,
+                errorSeverity: 10
+            }
+        },
+
+        commitish: '',
+        'git-rev-parse': {
+            options: {
+                prop: 'commitish',
+                silent: true,
+                number: 7
+            },
+            dist: {}
+        }
     });
 
     grunt.loadNpmTasks('grunt-contrib-concat');
@@ -138,8 +184,11 @@ module.exports = function (grunt) {
     //grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-phpcs');
+    grunt.loadNpmTasks('grunt-git-rev-parse');
 
-    grunt.registerTask('default', ['concat', 'autoprefixer', 'csso', 'uglify']);
-    grunt.registerTask('css', ['concat', 'autoprefixer', 'csso']);
-    grunt.registerTask('js', ['uglify']);
+    grunt.registerTask('default', ['css', 'js']);
+    grunt.registerTask('css', ['git-rev-parse', 'concat', 'autoprefixer', 'csso']);
+    grunt.registerTask('php', ['phpcs']);
+    grunt.registerTask('js', ['git-rev-parse', 'uglify']);
 };

index.php

@@ -3,6 +3,9 @@
     // Find out where we are:
     define('DOCROOT', __DIR__);
 
+    // Propagate this change to all executables:
+    chdir(DOCROOT);
+
     // Include autoloader:
     require_once DOCROOT . '/vendor/autoload.php';
 

install/includes/htaccess.txt

@@ -12,7 +12,7 @@ Options +SymLinksIfOwnerMatch -Indexes
     </IfModule>
 
     RewriteEngine on
-    RewriteBase /<!-- REWRITE_BASE -->
+    RewriteBase "/<!-- REWRITE_BASE -->"
 
     ### SECURITY - Protect crucial files
     RewriteRule ^manifest/(.*)$ - [F]

install/includes/install.sql

@@ -7,7 +7,7 @@ CREATE TABLE `tbl_authors` (
   `first_name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `last_name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_seen` datetime DEFAULT '0000-00-00 00:00:00',
+  `last_seen` datetime DEFAULT '1000-01-01 00:00:00',
   `user_type` enum('author','manager','developer') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'author',
   `primary` enum('yes','no') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'no',
   `default_area` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,

install/lib/class.installer.php

@@ -456,7 +456,7 @@ private static function __install()
                     'last_seen'             => null,
                     'user_type'             => 'developer',
                     'primary'               => 'yes',
-                    'default_area'          => null,
+                    'default_area'          => '/blueprints/sections/',
                     'auth_token_active'     => 'no'
                 ), 'tbl_authors');
             } catch (DatabaseException $e) {

install/migrations/2.7.0.php

@@ -0,0 +1,21 @@
+<?php
+
+    class migration_270 extends Migration
+    {
+        public static function getVersion()
+        {
+            return '2.7.0.beta1';
+        }
+
+        public static function getReleaseNotes()
+        {
+            return 'http://getsymphony.com/download/releases/version/2.7.0/';
+        }
+
+        public static function upgrade()
+        {
+
+            // Update the version information
+            return parent::upgrade();
+        }
+    }

package.json

@@ -1,18 +1,21 @@
 {
   "name": "symphonycms",
   "version": "2.6.7",
+  "homepage": "http://www.getsymphony.com",
   "repository": {
     "type": "git",
     "url": "https://github.com/symphonycms/symphony-2.git"
   },
   "license": "MIT",
   "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~3.0.3",
-    "grunt-csso": "~0.8.0",
-    "grunt-contrib-jshint": "~0.11.3",
-    "grunt-contrib-uglify": "~0.11.0",
-    "grunt-contrib-concat": "~0.5.1",
-    "grunt-contrib-watch": "~0.6.1"
+    "grunt": "~1.0.1",
+    "grunt-autoprefixer": "~3.0.4",
+    "grunt-contrib-concat": "~1.0.1",
+    "grunt-contrib-jshint": "~1.0.0",
+    "grunt-contrib-uglify": "~1.0.1",
+    "grunt-contrib-watch": "~1.0.0",
+    "grunt-csso": "~1.0.0",
+    "grunt-git-rev-parse": "^0.1.5",
+    "grunt-phpcs": "^0.4.0"
   }
 }

symphony/assets/css/src/admin.css

@@ -452,6 +452,7 @@ fieldset.settings.highlight {
 	margin: 0 0 0 -1.5rem;
 	padding: 0;
 	border: none;
+	display: block;
 }
 
 #password legend {
@@ -460,6 +461,7 @@ fieldset.settings.highlight {
 	color: #222;
 	line-height: 1.5;
 	text-shadow: none;
+	display: block;
 }
 
 #password i {
@@ -468,7 +470,7 @@ fieldset.settings.highlight {
 	right: 0;
 }
 
-div.password {
+.password {
 	position: absolute;
 	left: 0;
 	box-sizing: border-box;
@@ -478,8 +480,7 @@ div.password {
 }
 
 @media screen and (max-width: 700px) {
-
-	div.password {
+	.password {
 		padding: 0;
 	}
 }
@@ -606,15 +607,15 @@ ul.page form span {
 
 /* Checkboxes */
 
-div.field-checkbox {
+.field-checkbox {
 	min-height: 1.6rem;
 }
 
-div.field-checkbox:first-child {
+.field-checkbox:first-child {
 	margin-top: 2rem;
 }
 
-div.field-checkbox + .field:not(.field-checkbox) {
+.field-checkbox + .field:not(.field-checkbox) {
 	margin-top: 2.6rem;
 }
 

symphony/assets/css/src/symphony.drawers.css

@@ -11,17 +11,17 @@
 	Horizontal drawers
 -----------------------------------------------------------------------------*/
 
-div.drawer.horizontal {
+.drawer.horizontal {
 	position: relative;
 }
 
-div.drawer.horizontal .contents {
+.drawer.horizontal .contents {
 	margin-top: 1.7rem;
 	padding: 2rem 0;
 	border-top: 0.1rem solid rgba(0, 0, 0, 0.05);
 }
 
-div.drawer.horizontal .contents:after {
+.drawer.horizontal .contents:after {
 	content: ' ';
 	display: block;
 	clear: both;
@@ -37,8 +37,8 @@ div.drawer.horizontal .contents:after {
 /**
  * Height is set implicitly via `top` and `bottom` to allow for dynamic height.
  */
-div.drawer.vertical-left,
-div.drawer.vertical-right {
+.drawer.vertical-left,
+.drawer.vertical-right {
 	position: absolute;
 	top: 0;
 	bottom: 0;
@@ -48,17 +48,17 @@ div.drawer.vertical-right {
 	background: #f4f4f4;
 }
 
-div.drawer.vertical-left {
+.drawer.vertical-left {
 	left: 0;
 	border-right: 0.1rem solid rgba(0, 0, 0, 0.05);
 }
 
-div.drawer.vertical-right {
+.drawer.vertical-right {
 	right: 0;
 	border-left: 0.1rem solid rgba(0, 0, 0, 0.05);
 }
 
-div.drawer.vertical-left .contents,
-div.drawer.vertical-right .contents {
+.drawer.vertical-left .contents,
+.drawer.vertical-right .contents {
 	padding: 2rem;
 }

symphony/assets/js/src/backend.views.js

@@ -606,6 +606,10 @@ Symphony.View.add('/blueprints/datasources/:action:/:id:/:status:/:*:', function
 				});
 			}
 		}, 500, nameChangeCount, current, value);
+	})
+	// Enable the default value for Data Source name
+	.symphonyDefaultValue({
+		sourceElement: context
 	});
 
 	// Update output parameters
@@ -735,6 +739,10 @@ Symphony.View.add('/blueprints/events/:action:/:name:/:status:/:*:', function()
 				Symphony.Elements.contents.trigger('update.admin');
 			}
 		}, 500, nameChangeCount, current);
+	})
+	// Enable the default value for Event name
+	.symphonyDefaultValue({
+		sourceElement: context
 	});
 
 	// Change context