Skip to content

Commit

Permalink
Merge pull request #95 from FoxUSA/Fox-Working
Browse files Browse the repository at this point in the history
Fox working
  • Loading branch information
FoxUSA committed Oct 6, 2014
2 parents e621465 + 0741f2a commit 177b47a
Show file tree
Hide file tree
Showing 17 changed files with 823 additions and 21 deletions.
Binary file added Doc/screenShots/OpenNote.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/screenShots/OpenNoteHome.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/screenShots/login.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/screenShots/plants.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 25 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ module.exports = function(grunt) {
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less",

"OpenNote/openNote/style/simplicity/dark/style.css": "OpenNote/openNote/style/simplicity/style.less",
"OpenNote/openNote/style/simplicity/dark/note.css": "OpenNote/openNote/style/simplicity/note.less",
"OpenNote/openNote/style/simplicity/dark/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
"OpenNote/openNote/style/simplicity/dark/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"

}
},
Expand All @@ -29,7 +34,12 @@ module.exports = function(grunt) {
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less",

"OpenNote/openNote/style/simplicity/light/style.css": "OpenNote/openNote/style/simplicity/style.less",
"OpenNote/openNote/style/simplicity/light/note.css": "OpenNote/openNote/style/simplicity/note.less",
"OpenNote/openNote/style/simplicity/light/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
"OpenNote/openNote/style/simplicity/light/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
}
},
prodDark: {
Expand All @@ -44,7 +54,13 @@ module.exports = function(grunt) {
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less",

"OpenNote/openNote/style/simplicity/dark/style.css": "OpenNote/openNote/style/simplicity/style.less",
"OpenNote/openNote/style/simplicity/dark/note.css": "OpenNote/openNote/style/simplicity/note.less",
"OpenNote/openNote/style/simplicity/dark/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
"OpenNote/openNote/style/simplicity/dark/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"

}
},
prodLight: {
Expand All @@ -59,7 +75,12 @@ module.exports = function(grunt) {
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less",

"OpenNote/openNote/style/simplicity/light/style.css": "OpenNote/openNote/style/simplicity/style.less",
"OpenNote/openNote/style/simplicity/light/note.css": "OpenNote/openNote/style/simplicity/note.less",
"OpenNote/openNote/style/simplicity/light/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
"OpenNote/openNote/style/simplicity/light/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion OpenNote/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<body>
<div id="menu" class="ng-hide fadeIn" ng-show="showMenu" ng-include="'openNote/partials/navBarPartial.html'"></div>

<div class="col-lg-2 col-md-3 col-sm-4" ng-include="'openNote/partials/listPartial.html'"></div>
<div class="col-lg-2 col-md-3 col-sm-4 hidden-xs" ng-include="'openNote/partials/listPartial.html'"></div>

<div class="col-lg-10 col-md-9 col-sm-8" ng-view data-intro="{{helpContent.viewArea}}"> </div>
</body>
Expand Down
23 changes: 17 additions & 6 deletions OpenNote/openNote/controllers/folderController.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ openNote.controller("folderController", function( $scope,
$rootScope.buttons.push({
text: "New note",
action: function(){
$scope.fadeOutFolders(function(){
$scope.fadeOutFoldersAndNotes(function(){
$location.url("/note/").search("folderID",$scope.currentFolder.id);
});
},
Expand Down Expand Up @@ -81,13 +81,24 @@ openNote.controller("folderController", function( $scope,
/**
* fade out all folders
*/
$scope.fadeOutFolders = function(callback){
if($scope.currentFolder.foldersInside !=null && $scope.currentFolder.foldersInside.length>0)
$(".folder").fadeOut(config.fadeSpeedShort(),function(){
$scope.fadeOutFoldersAndNotes = function(callback){
if( ( $scope.currentFolder.foldersInside !=null
&& $scope.currentFolder.foldersInside.length>0)
|| ( $scope.currentFolder.notesInside !=null
&& $scope.currentFolder.notesInside.length>0)){

$(".note").fadeTo(config.fadeSpeedShort(),0,function(){
$scope.$apply(function(){
callback();
});
});

$(".folder").fadeTo(config.fadeSpeedShort(),0,function(){
$scope.$apply(function(){
callback();
});
});
}
else
callback();
};
Expand All @@ -97,7 +108,7 @@ openNote.controller("folderController", function( $scope,
* @param folder- the folder to load
*/
$scope.loadFolder = function(folder){
$scope.fadeOutFolders(function(){
$scope.fadeOutFoldersAndNotes(function(){
$location.url("/folder/"+folder.id);
});
};
Expand All @@ -107,7 +118,7 @@ openNote.controller("folderController", function( $scope,
* @param note - load a note
*/
$scope.loadNote = function(note){
$scope.fadeOutFolders(function(){
$scope.fadeOutFoldersAndNotes(function(){
$location.url("/note/"+note.id);
});
};
Expand Down
2 changes: 1 addition & 1 deletion OpenNote/openNote/directives/randomFadeInDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ openNote.directive("randomFadeInDirective", function($timeout,config) {
return {
restrict: "C",//class
link: function(scope, element, attrs) {
element.hide().fadeIn(config.fadeSpeedLong());
element.hide().stop().fadeTo(config.fadeSpeedLong(),1);
}
};
});
4 changes: 2 additions & 2 deletions OpenNote/openNote/openNote.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ openNote.value("config", {
* Get current version
*/
getVersion: function(){
return "14.07.01";
return "14.07.02";
},

/**
Expand All @@ -21,7 +21,7 @@ openNote.value("config", {
* http path to backend rest service
*/
servicePath: function(){
return "./Service";
return "./Service/service.php";
},

/**
Expand Down
6 changes: 5 additions & 1 deletion OpenNote/openNote/openNote.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ openNote.run(function ( $rootScope,
if(event!=null)
event.preventDefault();

$rootScope.entryURL=url;
if(url!=null && url.trim()!="" && url.trim()!="/"&& url.trim()!="#/")
$rootScope.entryURL=url;
else
$rootScope.entryURL=null;

$location.path("/");
}

Expand Down
4 changes: 2 additions & 2 deletions OpenNote/openNote/partials/folderPartial.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>
</div>

<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden randomFadeInDirective box folder jstree-draggable" ng-click="loadFolder(folder);">
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden randomFadeInDirective box folder" ng-click="loadFolder(folder);">
<h4>
{{folder.name}}
</h4>
Expand All @@ -17,7 +17,7 @@ <h4>
</p>
</div>

<div ng-Repeat="note in currentFolder.notesInside" class="box randomFadeInDirective note startHidden jstree-draggable" ng-click="loadNote(note);">
<div ng-Repeat="note in currentFolder.notesInside" class="startHidden box randomFadeInDirective note" ng-click="loadNote(note);">
<h4>
{{note.title}}
</h4>
Expand Down
8 changes: 4 additions & 4 deletions OpenNote/openNote/partials/loginPartial.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ <h1 ng-click="resetButtons();">OpenNote</h1>
<form>
<p>
<label>Username</label>
<input type="text" ng-model="userName"/>
<input class="form-control" type="text" ng-model="userName"/>
</p>

<p>
<label>Password</label>
<input type="password" ng-model="password"/>
<input class="form-control" type="password" ng-model="password"/>
</p>

<p>
Expand All @@ -27,12 +27,12 @@ <h1 ng-click="resetButtons();">OpenNote</h1>
<form>
<p>
<label>Choose a username</label>
<input type="text" ng-model="userName" ng-keyup="checkAvailability();"/> <span id="availability">{{isAvailable}}</span>
<input class="form-control" type="text" ng-model="userName" ng-keyup="checkAvailability();"/> <span id="availability">{{isAvailable}}</span>
</p>

<p>
<label>Choose a password</label>
<label><input type="password" ng-model="password"/></label>
<input class="form-control"type="password" ng-model="password"/>
</p>

<p>
Expand Down
6 changes: 6 additions & 0 deletions OpenNote/openNote/style/simplicity/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Ignore everything
*

#Except
!*.less
!.gitignore
118 changes: 118 additions & 0 deletions OpenNote/openNote/style/simplicity/alertify.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/**
* Twitter Bootstrap Look and Feel
* Based on http://twitter.github.com/bootstrap/
*/

/** offset all the other colors */
@offset: #000000;

.alertify,
.alertify-log {
font-family: inherit;
}
.alertify {
background: negation(#000, @offset);
border-radius: 6px;
top: 100px; /*how far down to appear*/
-webkit-background-clip: padding; /* Safari 4? Chrome 6? */
-moz-background-clip: padding; /* Firefox 3.6 */
background-clip: padding-box; /* Firefox 4, Safari 5, Opera 10, IE 9 */
}
.alertify-dialog {
padding: 0;
}
.alertify-inner {
text-align: left;
}
.alertify-message {
padding: 15px;
margin: 0;
}
.alertify-text-wrapper {
padding: 0 15px;
}
.alertify-text {
color: negation(#CCC, @offset);

padding: 8px;
border: 1px solid negation(#CCC, @offset);
}
.alertify-text:focus {
outline: 0;
}

.alertify-buttons {
padding: 14px 15px 15px;
text-align: right;
}
.alertify-button,
.alertify-button:hover,
.alertify-button:focus,
.alertify-button:active {
margin-left: 10px;
border-radius: 4px;
font-weight: inherit;
padding: 4px 12px;
text-decoration: none;
}
.alertify-button:focus {
outline: none;
}
.alertify-button:active {
position: relative;
}
.alertify-button-cancel,
.alertify-button-cancel:hover,
.alertify-button-cancel:focus,
.alertify-button-cancel:active {
color: negation(#CCC, @offset);
}
.alertify-button-cancel:hover,
.alertify-button-cancel:focus,
.alertify-button-cancel:active {
color: negation(#000, @offset);
background: negation(#fff, @offset);
}
.alertify-button-ok,
.alertify-button-ok:hover,
.alertify-button-ok:focus,
.alertify-button-ok:active {
color: negation(#CCC, @offset);
}
.alertify-button-ok:hover,
.alertify-button-ok:focus,
.alertify-button-ok:active {
color: negation(#000, @offset);
background: negation(#fff, @offset);
}

.alertify-log {
background: negation(#000, @offset);
padding: 8px 14px;
border-radius: 4px;
color: negation(#CCC, @offset);
border: none;
}
.alertify-log-error {
color: #CC0000; /*Always red never offset*/
}
.alertify-log-success {
color: negation(#CCC, @offset);
}

.alertify-cover {
transition: opacity 1s ease-out, width 0s;
background-color: negation(#555, @offset);
height: 100%;
position: fixed;
width: 100%;
top: 0;
opacity: 0.8;
right:0;
}

.alertify-cover.alertify-cover-hidden{/*For animation*/
display: block;
opacity: 0;
width:0;
}

0 comments on commit 177b47a

Please sign in to comment.