Skip to content

Commit

Permalink
1.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
neokoenig committed Nov 28, 2014
1 parent 0b142ca commit 025fb89
Show file tree
Hide file tree
Showing 130 changed files with 45,037 additions and 6,558 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,6 @@ pip-log.txt
WEB-INF
plugins/**/*
db/sql
config/auth.cfm
config/auth.cfm
bower_components
node_modules
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

Options +FollowSymLinks
RewriteEngine On
RewriteCond %{REQUEST_URI} !^.*/(flex2gateway|jrunscripts|cfide|cfformgateway|cffileservlet|railo-context|files|images|javascripts|miscellaneous|stylesheets|robots.txt|favicon.ico|sitemap.xml|rewrite.cfm)($|/.*$) [NC]
RewriteCond %{REQUEST_URI} !^.*/(flex2gateway|bower_components|jrunscripts|cfide|cfformgateway|cffileservlet|railo-context|files|images|javascripts|miscellaneous|stylesheets|robots.txt|favicon.ico|sitemap.xml|rewrite.cfm)($|/.*$) [NC]
RewriteRule ^(.*)$ ./rewrite.cfm/$1 [NS,L]
158 changes: 158 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
module.exports = function(grunt) {

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

// Task configuration
less: {
css: {
options: {
compress: false, //minifying the result
},
files: {
"stylesheets/rbs.css":"stylesheets/less/core/rbs.less"
}
}
},

cssmin: {
options: {
banner: "/*! <%= pkg.name %> minified CSS file generated @ <%= grunt.template.today('dd-mm-yyyy') %> */\n"
},
css: {
files: {
"stylesheets/rbs.min.css": [ "stylesheets/rbs.css" ]
}
}
},

clean : {
css : {
src: ["stylesheets/rbs.css", "stylesheets/rbs.min.css"]
},
js: {
src: ["javascripts/rbs.js","javascripts/rbs.min.js"]
}
},

concat : {
options: {
separator: ';',
},
frontend: {
src: [
// Bootstrap & JQuery
'bower_components/jquery/dist/jquery.js',
'bower_components/bootstrap/js/alert.js',
'bower_components/bootstrap/js/button.js',
'bower_components/bootstrap/js/carousel.js',
'bower_components/bootstrap/js/collapse.js',
'bower_components/bootstrap/js/dropdown.js',
'bower_components/bootstrap/js/modal.js',
'bower_components/bootstrap/js/tooltip.js',
'bower_components/bootstrap/js/popover.js',
'bower_components/bootstrap/js/tab.js',
'bower_components/bootstrap/js/transition.js',
// Calendar
'bower_components/moment/moment.js',
'bower_components/fullcalendar/dist/fullcalendar.js',
'bower_components/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
'bower_components/bootstrapvalidator/dist/js/bootstrapValidator.js',
'bower_components/minicolors/jquery.minicolors.js',
// Main.js is any custom JS
'javascripts/main.js'
],
dest: 'javascripts/rbs.js'
}
},



jshint: {
options: {
curly: true,
eqeqeq: true,
eqnull: true,
browser: true,
globals: {
jQuery: true
},
},
all: ['Gruntfile.js', 'javascripts/main.js']
},

uglify : {
frontend: {
files: {
'javascripts/rbs.min.js' : [ 'javascripts/rbs.js' ]
}
}
},

imagemin: {
png: {
options: {
optimizationLevel: 7
},
files: [
{
// Set to true to enable the following options…
expand: true,
// cwd is 'current working directory'
cwd: '/images/',
src: ['**/*.png'],
// Could also match cwd line above. i.e. project-directory/img/
dest: '/images/',
ext: '.png'
}
]
},
jpg: {
options: {
progressive: true
},
files: [
{
// Set to true to enable the following options…
expand: true,
// cwd is 'current working directory'
cwd: '/images/',
src: ['**/*.jpg'],
// Could also match cwd. i.e. project-directory/img/
dest: '/images/',
ext: '.jpg'
}
]
}
} ,

watch: {
js: {
files: ['javascripts/main.js'],
tasks: ['js']
},
css: {
files: ['stylesheets/less/core/*.less', 'stylesheets/less/site/*.less'],
tasks: ['css']
}
}


});

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-imagemin');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-injector');
grunt.loadNpmTasks('grunt-rev');

grunt.registerTask('css', ['clean:css', 'less:css', 'cssmin:css']);
grunt.registerTask('js', ['jshint', 'clean:js', 'concat', 'uglify']);
grunt.registerTask('img', ['imagemin']);
grunt.registerTask('default', ['watch']);
};
51 changes: 21 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,39 @@ Author: Tom King - http://www.oxalto.co.uk / https://github.com/Neokoenig / @neo

## Demo

You can find a demo at [roombooking.oxalto.co.uk][12]
You can find a demo at [roombooking.oxalto.co.uk][1]

## Version

Current version is 1.1 [release notes]

## Requirements

1. A server capable of running a cfWheels application - Adobe Coldfusion (8.x upwards) or Railo (4.x upwards), preferably with URL rewriting
2. Database - one of MySQL / Microsoft SQL Server / Oracle / PostgreSQL - whilst this should work on any of those, it's been tested on mySQL 5.x.
- A server capable of running a cfWheels application - Adobe Coldfusion (10.x upwards) or Railo (4.x upwards), preferably with URL rewriting
- Database - mySQL 5.x.

## Installation
## Installation & Upgrading

Moved to [Wiki][13]
Please see the [Wiki][2] for all documentation.

## Notes

This application uses the following plugins and 3rd party code:

1. [ColdFusion on Wheels][1]
2. [jQuery][2]
3. [jQueryUI][3]
4. [Bootstrap3] [4]
5. [Bootswatch Themes][5]
6. [FullCalendar][6]
7. [TimePicker][7]
8. [MomentJS][8]
9. [Colorpicker for Twitter Bootstrap][9]
11: [cfWheels FlashWrapper Plugin][11]

[1]: http://cfwheels.org/
[2]: http://jquery.com/
[3]: http://jqueryui.com/
[4]: http://getbootstrap.com/
[5]: http://bootswatch.com/
[6]: http://arshaw.com/fullcalendar/
[7]: http://trentrichardson.com/examples/timepicker/
[8]: http://momentjs.com/
[9]: http://mjaalnir.github.io/bootstrap-colorpicker/
[11]: https://github.com/gregstallings/cfwheels-flash-wrapper
[12]: http://roombooking.oxalto.co.uk
[13]: https://github.com/neokoenig/RoomBooking/wiki/_pages
- [ColdFusion on Wheels][3]
- [jQuery][4]
- [Bootstrap3] [5]
- [FullCalendar][6]
- [MomentJS][7]

## License

Room Booking System is released under the Apache License Version 2.0.



[1]: http://roombooking.oxalto.co.uk
[2]: https://github.com/neokoenig/RoomBooking/wiki/_pages
[3]: http://cfwheels.org/
[4]: http://jquery.com/
[5]: http://getbootstrap.com/
[6]: http://fullcalendar.io/
[7]: http://momentjs.com/
28 changes: 28 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "Room Booking System",
"version": "1.1.0",
"homepage": "https://github.com/neokoenig/RoomBooking",
"authors": [
"Tom King <[email protected]>"
],
"description": "Room Booking System",
"license": "MIT",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"source",
"test",
"tests"
],
"devDependencies": {
"bootstrap": "~3.3.1",
"moment": "~2.8.3",
"fullcalendar": "~2.2.0",
"eonasdan-bootstrap-datetimepicker": "~3.1.3",
"bootstrapvalidator": "~0.5.3",
"colorpicker": "~1.0.16",
"minicolors": "~2.1.7"
}
}
13 changes: 6 additions & 7 deletions config/routes.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@
The default route is the one that will be called on your application's "home" page.
--->
<cfscript>
// Customer Routes
addRoute(name="updateaccount", pattern="/my/account/u", controller="users", action="updateaccount");
addRoute(name="myaccount", pattern="/my/account", controller="users", action="myaccount");
addRoute(name="updateaccount", pattern="/my/account/u", controller="users", action="updateaccount");
addRoute(name="myaccount", pattern="/my/account", controller="users", action="myaccount");
addRoute(name="updatepassword", pattern="/my/password/u", controller="users", action="updatepassword");
addRoute(name="mypassword", pattern="/my/password", controller="users", action="mypassword");
addRoute(name="mypassword", pattern="/my/password", controller="users", action="mypassword");
// Login/Out
addRoute(name="logout", pattern="/logout", controller="sessions", action="logout");
addRoute(name="attemptlogin", pattern="/login/a/", controller="sessions", action="attemptlogin");
addRoute(name="login", pattern="/login", controller="sessions", action="new");
addRoute(name="forgetme", pattern="/forgetme", controller="sessions", action="forgetme");
addRoute(name="denied", pattern="/denied", controller="sessions", action="denied");
addRoute(name="denied", pattern="/denied", controller="sessions", action="denied");
// Default
addRoute(name="home", pattern="", controller="bookings", action="index");
</cfscript>
</cfscript>
34 changes: 17 additions & 17 deletions config/settings.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
If you leave these settings commented out, Wheels will set the data source name to the same name as the folder the application resides in.
<cfset set(dataSourceUserName="")>
<cfset set(dataSourcePassword="")>
<cfset set(dataSourcePassword="")>
--->

<!---
If you leave this setting commented out, Wheels will try to determine the URL rewrite capabilities automatically.
The URLRewriting setting can bet set to "On", "Partial" or "Off".
Expand All @@ -14,7 +14,7 @@
--->
<cfscript>
set(dataSourceName="roombooking");
set(URLRewriting="on");
set(URLRewriting="on");
set(allowedEnvironmentSwitchThroughURL=true);
set(reloadPassword="roombooking");
Expand All @@ -25,26 +25,26 @@ set(excludeFromErrorEmail="password,hashedpassword,passwordsalt,ssn");
set(flashStorage="session"); // valid values are "session" or "cookie"
set(obfuscateURLs=false);
set(overwritePlugins=true); // set to false for plugin development
// BS3 form settings
set(functionName="startFormTag");
set(functionName="submitTag", class="btn btn-primary", value="Save Changes");
set(functionName="checkBox,checkBoxTag,radioButton,radioButtonTag", labelPlacement="around", prependToLabel="<div class=""checkbox"">", appendToLabel="</div>", uncheckedValue="0");
set(functionName="radioButton,radioButtonTag", labelPlacement="around", prependToLabel="<div class=""radio"">", appendToLabel="</div>" );
set(functionName="textField,textFieldTag,select,selectTag,passwordField,passwordFieldTag,textArea,textAreaTag,fileFieldTag,fileField",
class="form-control",
labelClass="control-label",
labelPlacement="before",
prependToLabel="<div class=""form-group"">",
prepend="<div class="""">",
append="</div></div>" );
set(functionName="checkBox,checkBoxTag", labelPlacement="aroundRight", prependToLabel="<div class=""checkbox"">", appendToLabel="</div>", uncheckedValue="0");
set(functionName="radioButton,radioButtonTag", labelPlacement="aroundRight", prependToLabel="<div class=""radio"">", appendToLabel="</div>");
set(functionName="textField,textFieldTag,select,selectTag,passwordField,passwordFieldTag,textArea,textAreaTag,fileFieldTag,fileField",
class="form-control",
labelClass="control-label",
labelPlacement="before",
prependToLabel="<div class=""form-group"">",
prepend="",
append="</div>" );
set(functionName="dateTimeSelect,dateSelect", prepend="<div class=""form-group"">", append="</div>", timeSeparator="", minuteStep="5", secondStep="30", dateOrder="day,month,year", dateSeparator="", separator="");
set(functionName="dateTimeSelect,dateSelect", prepend="<div class=""form-group"">", append="</div>", timeSeparator="", minuteStep="5", secondStep="10", dateOrder="day,month,year", dateSeparator="", separator="");
set(functionName="errorMessagesFor", class="alert alert-danger"" style=""margin-left:0;padding-left:26px;");
set(functionName="errorMessagesFor", class="alert alert-dismissable alert-danger"" style=""margin-left:0;padding-left:26px;");
set(functionName="errorMessageOn", wrapperElement="div", class="alert alert-danger");
set(functionName="flash", prepend="<div class=""alert""><a class=""close"" data-dismiss=""alert"">&times;</a>", append="</div>");
set(functionName="flashMessages", prependToValue="<div class=""alert alert-info""><a class=""close"" data-dismiss=""alert"">&times;</a>", appendToValue="</div>");
set(functionName="flashMessages", prependToValue="<div class=""alert alert-dismissable alert-info""><a class=""close"" data-dismiss=""alert"">&times;</a>", appendToValue="</div>");
set(functionName="paginationLinks", prepend="<ul class=""pagination"">", append="</ul>", prependToPage="<li>", appendToPage="</li>", linkToCurrentPage=true, classForCurrent="active", anchorDivider="<li class=""disabled""><a href=""##"">...</a></li>");
</cfscript>
</cfscript>
Loading

0 comments on commit 025fb89

Please sign in to comment.