Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
KostyaDanovsky committed Feb 3, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents ba1bd6a + 0737bdb commit b1cabf2
Showing 61 changed files with 424 additions and 435 deletions.
8 changes: 4 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -20,16 +20,16 @@
"amcharts": "~3.15.2",
"amcharts-stock": "*",
"ammap": "~3.14.5",
"angular": "~1.4.6",
"angular": "~1.4.8",
"angular-route": "~1.4.6",
"angular-slimscroll": "~1.1.5",
"angular-smart-table": "~2.1.3",
"angular-toastr": "~1.5.0",
"angular-toastr": "~1.6.0",
"angular-touch": "~1.4.6",
"angular-ui-sortable": "~0.13.4",
"animate.css": "~3.4.0",
"bootstrap": "~3.3.5",
"bootstrap-select": "~1.7.3",
"bootstrap-select": "~1.9.3",
"bootstrap-switch": "~3.3.2",
"bootstrap-tagsinput": "~0.5.0",
"font-awesome": "fontawesome#~4.4.0",
@@ -77,7 +77,7 @@
"bootstrap": {
"main": [
"dist/css/bootstrap.css",
"dist/js/bootstrap.js"
"js/dropdown.js"
]
},
"slimScroll": {
1 change: 1 addition & 0 deletions src/app/app.js
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ angular.module('BlurAdmin', [
"xeditable",
'ui.slimscroll',
'ngJsTree',
'angular-progress-button-styles',

'BlurAdmin.theme',
'BlurAdmin.pages',
26 changes: 12 additions & 14 deletions src/app/pages/components/mail/list/mailList.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<div class="side-message-navigation">
<div class="messages-control side-message-navigation-item">
<div class="mail-messages-control side-message-navigation-item">
<label class="checkbox-inline custom-checkbox nowrap margin-left">
<span class="select-all-label">Select All</span>
<input type="checkbox" id="inlineCheckbox01" value="option1">
<span class="select-all-label">Select All</span>
</label>
<button type="button" class="btn btn-icon margin-left"><i class="ion-refresh"></i></button>
<div class="btn-group margin-left">
<button type="button" class="btn btn-icon dropdown-toggle more-button" data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">More<span class="caret"></span>
<div class="btn-group margin-left" uib-dropdown>
<button type="button" class="btn more-button" uib-dropdown-toggle>
More <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<ul uib-dropdown-menu>
<li><a href>Action</a></li>
<li><a href>Another action</a></li>
<li><a href>Something else here</a></li>
@@ -22,29 +21,28 @@
<div class="messages">
<table>
<tr ng-repeat="m in listCtrl.messages track by m.id | orderBy:'-date'"
class="side-message-navigation-item little-human shineHover {{m.tag}}"
ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
class="side-message-navigation-item little-human shineHover {{m.tag}}">
<td>
<div class="mail-checkbox">
<label class="checkbox-inline custom-checkbox nowrap margin-left">
<span></span>
<input type="checkbox">
<span></span>
</label>
</div>
</td>
<td><img ng-src="{{m.name.split(' ')[0] | profilePicture}}" class="little-human-picture"></td>
<td >
<td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})"><img ng-src="{{m.name.split(' ')[0] | profilePicture}}" class="little-human-picture"></td>
<td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<div class="margin-left">
<div><span class="name">{{m.name.split(' ')[0] + ' ' + m.name.split(' ')[1][0]}}.</span></div>
<div><span class="tag label label-primary {{m.tag}}">{{m.tag}}</span></div>
</div>
</td>
<td >
<td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<div class="margin-left additional-info">
<span class="subject"> {{m.subject}}</span>
</div>
</td>
<td>
<td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<div class="mail-body-part">{{m.body | plainText}}</div>
</td>
<td class="date">
13 changes: 13 additions & 0 deletions src/app/pages/components/mail/mailMessages.js
Original file line number Diff line number Diff line change
@@ -176,6 +176,19 @@
"tag": "study",
"labels": ['draft']
},
{
"id": "8223xsdaa",
"name": "Andrey Hrabouski",
"subject": "Car rent",
"date": "2015-02-25T10:58:58",
"body": $sce.trustAsHtml("<p>Hey Andrey. </p>" +
"<p>Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed. Sed quis orci sed nisl sagittis viverra id at mauris. Nam venenatis mi nibh. Sed fringilla mattis vehic</p>"),
"pic": "img/Andrey.png",
"email": "[email protected]",
"position": "Mobile Developer",
"tag": "family",
"labels": ['draft']
},
{
"id": "9391xdsff",
"name": "Vlad Lugovsky",
6 changes: 0 additions & 6 deletions src/app/pages/components/tree/tree.html
Original file line number Diff line number Diff line change
@@ -16,12 +16,6 @@
<div>
<button class="btn btn-primary" ng-click="refresh()">Refresh</button>
</div>
<div>
<div class="form-group text-left search-container">
<label for="search">Filter</label>
<input id="search" type="text" class="form-control" ng-model="query" ng-change="find()">
</div>
</div>
</div>
</div>
<div class="col-sm-8">
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div id='calendar'></div>
<div id='calendar' class="blurCalendar"></div>
12 changes: 6 additions & 6 deletions src/app/pages/form/inputs/widgets/select/select.html
Original file line number Diff line number Diff line change
@@ -76,23 +76,23 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<select class="form-control" title="Primary Select" data-style="btn-primary" selectpicker>
<select class="form-control" title="Primary Select" data-style="btn-primary" data-container="body" selectpicker>
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
<option>Option 4</option>
</select>
</div>
<div class="form-group">
<select class="form-control" title="Success Select" data-style="btn-success" selectpicker>
<select class="form-control" title="Success Select" data-style="btn-success" data-container="body" selectpicker>
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
<option>Option 4</option>
</select>
</div>
<div class="form-group">
<select class="form-control" title="Warning Select" data-style="btn-warning" selectpicker>
<select class="form-control" title="Warning Select" data-style="btn-warning" data-container="body" selectpicker>
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
@@ -102,7 +102,7 @@
</div>
<div class="col-sm-6">
<div class="form-group">
<select class="form-control" title="Info Select" data-style="btn-info" selectpicker>
<select class="form-control" title="Info Select" data-style="btn-info" data-container="body" selectpicker>
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
@@ -111,7 +111,7 @@
</div>

<div class="form-group">
<select class="form-control" title="Danger Select" data-style="btn-danger" selectpicker>
<select class="form-control" title="Danger Select" data-style="btn-danger" data-container="body" selectpicker>
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
@@ -120,7 +120,7 @@
</div>

<div class="form-group">
<select class="form-control" title="Inverse Select" data-style="btn-inverse" selectpicker>
<select class="form-control" title="Inverse Select" data-style="btn-inverse" data-container="body" selectpicker>
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
Original file line number Diff line number Diff line change
@@ -9,14 +9,16 @@
.directive('selectpicker', selectpicker);

/** @ngInject */
function selectpicker() {
function selectpicker($timeout) {
return {
restrict: 'A',
link: function( $scope, elem) {
$(elem).selectpicker();
$timeout(function() {
$(elem).selectpicker();
}, 0);
}
};
}


})();
3 changes: 0 additions & 3 deletions src/app/pages/maps/leaflet/LeafletPageCtrl.js
Original file line number Diff line number Diff line change
@@ -12,9 +12,6 @@
function LeafletPageCtrl($timeout) {
function initialize() {
var map = L.map(document.getElementById('leaflet-map')).setView([51.505, -0.09], 13);

L.Icon.Default.imagePath = 'img';

L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
19 changes: 19 additions & 0 deletions src/app/pages/profile/ProfileModalCtrl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* @author a.demeshko
* created on 21.01.2016
*/
(function () {
'use strict';

angular.module('BlurAdmin.pages.profile')
.controller('ProfileModalCtrl', ProfileModalCtrl);

/** @ngInject */
function ProfileModalCtrl($scope, $uibModalInstance) {
$scope.link = '';
$scope.ok = function () {
$uibModalInstance.close($scope.link);
};
}

})();
14 changes: 10 additions & 4 deletions src/app/pages/profile/ProfilePageCtrl.js
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@
'use strict';

angular.module('BlurAdmin.pages.profile')
.controller('ProfilePageCtrl', ProfilePageCtrl);
.controller('ProfilePageCtrl', ProfilePageCtrl);

/** @ngInject */
function ProfilePageCtrl($scope, fileReader, $filter) {
function ProfilePageCtrl($scope, fileReader, $filter, $uibModal) {
$scope.picture = $filter('profilePicture')('Nasta');

$scope.removePicture = function () {
@@ -65,8 +65,14 @@
item.href = undefined;
};

$scope.showModal = function () {
$('#profileModal').modal('show');
$scope.showModal = function (item) {
$uibModal.open({
animation: false,
controller: 'ProfileModalCtrl',
templateUrl: 'app/pages/profile/profileModal.html'
}).result.then(function (link) {
item.href = link;
});
};

$scope.getFile = function () {
3 changes: 1 addition & 2 deletions src/app/pages/profile/profile.html
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ <h3 class="with-line">Social Profiles</h3>
<div class="social-profiles row clearfix">
<div class="col-md-3 col-sm-4" ng-repeat="item in socialProfiles">

<a class="sn-link" href ng-click="showModal()" ng-if="!item.href">
<a class="sn-link" href ng-click="showModal(item)" ng-if="!item.href">
<i class="socicon {{ item.icon }}"></i>
<span>{{ item.name }}</span>
</a>
@@ -215,4 +215,3 @@ <h3 class="with-line">Send Email Notifications</h3>
</div>
</div>
</div>
<profile-modal></profile-modal>
26 changes: 0 additions & 26 deletions src/app/pages/profile/profileModal.directive.js

This file was deleted.

39 changes: 18 additions & 21 deletions src/app/pages/profile/profileModal.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<div class="modal profile-modal fade" id="profileModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<em class="ion-ios-close-empty sn-link-close"></em>
</button>
<h4 class="modal-title" id="myModalLabel">Add Account</h4>
</div>
<form name="linkForm">
<div class="modal-body">
<p>Paste a link to your profile into the box below</p>
<div class="form-group">
<input type="text" class="form-control" placeholder="Link to Profile" ng-model="link">
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="bindProfile()">Save changes</button>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" ng-click="$dismiss()" aria-label="Close">
<em class="ion-ios-close-empty sn-link-close"></em>
</button>
<h4 class="modal-title" id="myModalLabel">Add Account</h4>
</div>
<form name="linkForm">
<div class="modal-body">
<p>Paste a link to your profile into the box below</p>

<div class="form-group">
<input type="text" class="form-control" placeholder="Link to Profile" ng-model="link">
</div>
</form>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="ok(link)">Save changes</button>
</div>
</form>
</div>
2 changes: 1 addition & 1 deletion src/app/pages/tables/TablesPageCtrl.js
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
/** @ngInject */
function TablesPageCtrl($scope, $filter) {

$scope.smartTablePageSize = 12;
$scope.smartTablePageSize = 10;

$scope.smartTableData = [
{
12 changes: 5 additions & 7 deletions src/app/pages/tables/widgets/smartTable.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<div class="horizontal-scroll">
<div class="form-group select-page-size-wrap ">
<select class="form-control" data-live-search="true" title="Rows on page" selectpicker>
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>
<label>Rows on page
<select class="form-control selectpicker show-tick" title="Rows on page" selectpicker
ng-model="smartTablePageSize" ng-options="i for i in [5,10,15,20,25]">
</select>
</label>
</div>
<table class="table" st-table="smartTableData">
<thead>
8 changes: 4 additions & 4 deletions src/app/pages/ui/alerts/alerts.html
Original file line number Diff line number Diff line change
@@ -70,11 +70,11 @@
ba-panel-title="Composite alerts"
ba-panel-class="with-scroll">
<div>
<div class="alert bg-danger">
<h5>Unhandled error!</h5>
<strong>Oh snap!</strong> Change a few things up and try submitting again.
<div class="alert bg-warning">
<h4>Warning!</h4>
<strong>Pay attention.</strong> Change a few things up and try submitting again.
<div class="control-alert">
<button type="button" class="btn btn-danger ">Agree</button>
<button type="button" class="btn btn-warning ">Pay Attention</button>
<button type="button" class="btn btn-default ">Ignore</button>
</div>
</div>
Loading
Oops, something went wrong.

0 comments on commit b1cabf2

Please sign in to comment.