Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
colintucker committed Apr 19, 2018
2 parents fd6d67a + 073e103 commit 6c255a7
Show file tree
Hide file tree
Showing 23 changed files with 6,181 additions and 4,094 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ Please see [contributing](CONTRIBUTING.md) for more information.

## Maintainers

[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](http://www.praxis.net.au)
[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](https://www.praxis.net.au)
---|---
[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](http://www.praxis.net.au)
[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](https://www.praxis.net.au)

## License

Expand Down
Binary file added admin/client/dist/images/icons/SharingIcon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/client/src/images/icons/SharingIcon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/dist/styles/bundle.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions client/src/bundles/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
// Load Styles:

require('styles/bundle.scss');

// Load Components:

require('components/SharingIconBarComponent.js');
30 changes: 30 additions & 0 deletions client/src/components/SharingIconBarComponent.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/* Sharing Icon Bar Component
===================================================================================================================== */

import $ from 'jquery';

$(function() {

// Handle Icon Bar Links:

$('.sharingiconbarcomponent').each(function() {

var $self = $(this);
var $icons = $self.find('.sharingicon');

$icons.on('click', function(e) {
e.preventDefault();
return true;
});

$icons.each(function() {
var $icon = $(this);
$icon.popover({
html: true,
content: $icon.find('.sharingicon-popover-content')
});
});

});

});
2 changes: 2 additions & 0 deletions client/src/styles/bundle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

// Import Button Styles:

@import "buttons/SharingButton";
@import "buttons/EmailSharingButton";

// Import Component Styles:

@import "components/SharingComponent";
@import "components/SharingIconBarComponent";
7 changes: 7 additions & 0 deletions client/src/styles/buttons/SharingButton.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* Sharing Button Styles
===================================================================================================================== */

.sharingbutton {
font-size: 0;
overflow: hidden;
}
51 changes: 51 additions & 0 deletions client/src/styles/components/SharingIconBarComponent.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/* Sharing Icon Bar Component Styles
===================================================================================================================== */

.sharingiconbarcomponent {

ul.icons {

margin: 0;
padding: 0;
font-size: 0;
list-style-type: none;

> li.icon {

> .sharingicon {

cursor: pointer;
display: inline-block;

.sharingicon-popover-content {
display: none;
}

}

}

&.vertical {

> li.icon {
display: block;
}

}

&.horizontal {

> li.icon {
display: inline-block;
}

}

}

}

.sharingicon-popover-content {
min-width: 120px;
text-align: center;
}
38 changes: 21 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"name": "Colin Tucker",
"email": "colin@praxis.net.au",
"url": "http://www.praxis.net.au"
"url": "https://www.praxis.net.au"
}
],
"repository": {
Expand All @@ -25,29 +25,33 @@
"url": "https://github.com/praxisnetau/silverware-social/issues"
},
"engines": {
"node": "^4.2.0"
"node": "^8.x"
},
"scripts": {
"watch": "webpack --env.development --colors --watch",
"build": "webpack --env.production --colors --optimize-minimize"
"build": "webpack --env.production --colors --progress --optimize-minimize"
},
"dependencies": {},
"devDependencies": {
"autoprefixer": "^7.1.5",
"autoprefixer": "^8.2.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0",
"clean-webpack-plugin": "^0.1.17",
"copy-webpack-plugin": "^4.1.1",
"css-loader": "^0.28.7",
"extract-text-webpack-plugin": "^3.0.1",
"file-loader": "^1.1.5",
"node-sass": "^4.5.3",
"postcss-loader": "^2.0.6",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"webpack": "^3.6.0"
"babel-loader": "^7.1.4",
"babel-preset-env": "^1.6.1",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.11",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.11",
"node-sass": "^4.8.3",
"postcss-loader": "^2.1.3",
"resolve-url-loader": "^2.3.0",
"sass-loader": "^6.0.7",
"style-loader": "^0.20.3",
"svgo": "^1.0.5",
"svgo-loader": "^2.1.0",
"uglifyjs-webpack-plugin": "^1.2.4",
"url-loader": "^1.0.1",
"webpack": "^3.11.0"
},
"babel": {
"presets": [
Expand Down
9 changes: 8 additions & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
module.exports = {};
/* PostCSS Configuration
===================================================================================================================== */

module.exports = {
plugins: [
require('autoprefixer')
]
};
16 changes: 16 additions & 0 deletions src/Buttons/EmailSharingButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,22 @@ public function fieldLabels($includerelations = true)
return $labels;
}

/**
* Populates the default values for the fields of the receiver.
*
* @return void
*/
public function populateDefaults()
{
// Populate Defaults (from parent):

parent::populateDefaults();

// Populate Defaults:

$this->Title = _t(__CLASS__ . '.DEFAULTTITLE', 'Share via Email');
}

/**
* Answers the subject for the email.
*
Expand Down

0 comments on commit 6c255a7

Please sign in to comment.