backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es17.01

Browse Source
This commit is contained in:
Jocelyn FIAT
2017-03-03 11:18:12 +01:00
parent 12e02bdfbf 0febe3418b
commit 79df423c7a
24 changed files with 338 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/demo/site/modules/messaging/files/css/messaging.css
View File

@@ -1,4 +1,16 @@
.messaging-box fieldset {
resize: both;
display: flex;
flex-wrap: wrap;
align-items: flex-start;
overflow: scroll;
height: 250px;
height: 50ex;
line-height: 2.5ex;
}
.messaging-box fieldset div {
width: 300px;
}
.messaging-box fieldset input[type="checkbox"] {
margin-right: 5px;
margin-left: 3px;
}

15
examples/demo/site/modules/messaging/files/scss/messaging.scss
View File

@@ -1,6 +1,19 @@
.messaging-box {
fieldset {
resize: both;
display: flex;
flex-wrap: wrap;
align-items: flex-start;
div {
width: 300px;
}
overflow:scroll;
height:250px;
height:50ex;
line-height: 2.5ex;
input[type="checkbox"] {
margin-right: 5px;
margin-left: 3px;
}
}
}

2
examples/demo/site/modules/node/scripts/node.sql
View File

@@ -8,6 +8,7 @@ CREATE TABLE nodes (
`content` TEXT,
`format` VARCHAR(128),
`author` INTEGER,
`editor` INTEGER,
`publish` DATETIME,
`created` DATETIME NOT NULL,
`changed` DATETIME NOT NULL,
@@ -23,6 +24,7 @@ CREATE TABLE node_revisions (
`content` TEXT,
`format` VARCHAR(128),
`author` INTEGER,
`editor` INTEGER,
`changed` DATETIME NOT NULL,
`status` INTEGER,
CONSTRAINT Unique_nid_revision PRIMARY KEY (nid,revision)

7
examples/demo/site/modules/node/scripts/updates/node-1.0.0.1.sql Normal file
View File

@@ -0,0 +1,7 @@
ALTER TABLE nodes ADD editor INTEGER ;
UPDATE nodes SET editor = author;
ALTER TABLE node_revisions ADD editor INTEGER ;
UPDATE node_revisions SET editor = author;