forked from akveo/blur-admin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/v2' into v2
- Loading branch information
Showing
61 changed files
with
424 additions
and
435 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<div id='calendar'></div> | ||
<div id='calendar' class="blurCalendar"></div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
}; | ||
} | ||
|
||
})(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.