Skip to content

Commit

Permalink
Merge pull request #2 from akshayknarayan/props
Browse files Browse the repository at this point in the history 
New Props App
  • Loading branch information
Mark Weitzel committed Aug 14, 2013
2 parents 566201f + 91fd03e commit c7a04e7
Show file tree
Hide file tree
Showing 42 changed files with 1,482 additions and 1,711 deletions.
6 changes: 0 additions & 6 deletions applications/props/.gitignore
View file

This file was deleted.

1 change: 0 additions & 1 deletion applications/props/props-app/.gitignore
View file

This file was deleted.

110 changes: 63 additions & 47 deletions applications/props/props-app/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,68 +19,84 @@ module.exports = function(grunt) {
// Project configuration.
grunt.initConfig({

concat: {
vendor: {
src: [
'vendor/jquery-1.7.2/jquery.min.js',
'vendor/underscore-1.3.3/underscore.min.js',
'vendor/backbone-0.9.2/backbone.min.js',
'vendor/jive-proxy-url/jive-proxy-url.js',
'vendor/jquery-timeago/jquery-timeago.js',
'vendor/bootstrap/bootstrap.min.js',
'vendor/bootstrap/bootstrap-typeahead-custom-ajax.js',
'vendor/bootstrap/bootstrap-alert.js',
'vendor/bootstrap/bootstrap-modal.js',
'vendor/bootstrap/bootstrap-tooltip.js',
'vendor/bootstrap/bootstrap-popover.js',
'vendor/bootstrap/bootstrap-dropdown.js'
],
dest: 'dist/vendor.js',
separator: ';'
},
concat: {
vendor: {
src: [
'vendor/jquery-1.7.2/jquery.min.js',
'vendor/underscore-1.3.3/underscore.min.js',
'vendor/backbone-0.9.2/backbone.min.js',
'vendor/jive-proxy-url/jive-proxy-url.js',
'vendor/jquery-timeago/jquery-timeago.js',
'vendor/bootstrap/bootstrap.min.js',
'vendor/bootstrap/bootstrap-typeahead-custom-ajax.js',
'vendor/bootstrap/bootstrap-alert.js',
'vendor/bootstrap/bootstrap-modal.js',
'vendor/bootstrap/bootstrap-tooltip.js',
'vendor/bootstrap/bootstrap-popover.js',
'vendor/bootstrap/bootstrap-dropdown.js'
],
dest: 'dist/vendor.js',
separator: ';'
},

props: {
src: [
'js/init.js',
'js/osapi_http_sync.js',
'js/models/person.js',
'js/models/prop.js',
'js/models/prop_type.js',
'js/collections/people.js',
'js/collections/props.js',
'js/collections/prop_types.js',
'js/views/sidebar_view.js',
'js/views/sidebar_item_view.js',
'js/views/sidebar_list_view.js',
'js/views/activity_stream_view.js',
'js/views/activity_entry_view.js',
'js/views/find_trophy_case_view.js',
'js/views/trophy_display_view.js',
'js/views/trophy_sidebar_view.js',
'js/views/give_props_wizard_view.js',
'js/main.js'
],
dest: 'dist/props.js',
separator: ';'
}
props: {
src: [
'js/init.js',
'js/osapi_http_sync.js',
'js/models/person.js',
'js/models/prop.js',
'js/models/prop_type.js',
'js/collections/people.js',
'js/collections/props.js',
'js/collections/prop_types.js',
'js/views/sidebar_view.js',
'js/views/sidebar_item_view.js',
'js/views/sidebar_list_view.js',
'js/views/activity_stream_view.js',
'js/views/activity_entry_view.js',
'js/views/find_trophy_case_view.js',
'js/views/trophy_display_view.js',
'js/views/trophy_sidebar_view.js',
'js/views/give_props_wizard_view.js',
'js/main.js'
],
dest: 'dist/props.js',
separator: ';'
},

},
admin: {
src: [
'vendor/jquery-1.7.2/jquery.min.js',
'vendor/bootstrap/bootstrap-dropdown.js',
'js/init.js',
'js/make_http_request.js',
'js/admin_main.js'
],
dest: 'dist/admin.js',
separator: ';'
}

uglify: {
},

uglify: {
options: {
},
admin: {
files: {
'dist/admin.min.js':['dist/admin.js']
}
},
dist: {
files: {
'dist/all.min.js' : ['dist/vendor.js', 'dist/props.js']
}
}
}

});

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');

grunt.registerTask('default', ['concat:vendor', 'concat:props', 'uglify:dist']);
grunt.registerTask('default', ['concat:vendor', 'concat:props', 'concat:admin', 'uglify:dist', 'uglify:admin']);

};
84 changes: 52 additions & 32 deletions applications/props/props-app/admin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,54 +27,74 @@
</div>


<div class="container-fluid" id="admin-panel-main" style="display:none">
<div class="container-fluid max-height no-overflow" id="admin-panel-main" style="display:none">
<div class="alert" style="display:none">
<!--Area for alerts to appear-->
</div>
<!-- ******** NavBar ********* -->
<ul class="span6 nav nav-pills" style="padding-left: 128px;padding-top: 24px;">
<li class="active"><a href="#" id="create-prop-type-tab">Create/Modify</a></li>
<li><a href="#" id="remove-prop-type-tab">Remove</a></li>
</ul>
<hr class="span6">
<div class="row-fluid" style="padding-top: 5px">
<div style="margin-left: 5px">
<h4>Customize what props can be given and received in your community.</h4>
</div>
</div>
<hr style="margin:5px">
<!-- ******** Main Content ********* -->
<div class="span6 main-content">
<div class="row-fluid main-content">
<div style="text-align:right;margin-right:20px">
<a class="btn btn-small" href="#" id="create-prop-type-tab">New Prop</a>
<a class="btn btn-small" href="#" id="remove-prop-type-tab" style="display:none">All Props</a>
</div>
<!-- Create Prop Type -->
<div class="sub-container" id="create-prop-types">
<div class="sub-container" id="create-prop-types" style="display:none">
<div class="span4 well propType-adder">
<div class="row-fluid">
<strong>Create New Prop Type</strong>
<input type="text" placeholder="Title" id="title-inp">
<input type="text" placeholder="Level Needed to Give" id="level-inp">
<textarea class="input-large" id="definition-inp" rows="3" placeholder="Your Prop's Tagline"></textarea>
<label for="title-inp" style="margin:0px">Title</label>
<input type="text" placeholder="Unique Name For This Prop" id="title-inp" maxlength=15>
<label for="level-inp" style="margin:0px">Level Required to Give This Prop (0-1000)</label>
<input class="input-mini" type="text" placeholder="Level" id="level-inp" maxlength=4>
<label for="definition-inp" style="margin:0px">Description</label>
<textarea class="input-large" id="definition-inp" rows="3" placeholder="Your Prop's Tagline" style="resize:none"></textarea>
<p style="margin:0px">Image URL<br><small>Provide an Absolute Path To The Image For This Prop.</small></p>
<input type="text" id="img-inp" placeholder="Link to Image">
<a href="#" class="btn btn-success create-it">Create Prop!</a>
<p style="margin:0px"><small>All images will be scaled to 128x128</small></p>
<a href="#" class="btn btn-primary" id="create-it">Save Prop!</a>
</div>
</div>
</div>

<!-- Remove Prop Types -->
<div class="sub-container" id="remove-prop-types" style="display:none">
<div class="btn-toolbar">
<div class="btn-group">
<a class="btn btn-danger dropdown-toggle" data-toggle="dropdown" href="#">
Remove Prop Type
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<!-- all types available to remove -->
</ul>
</div>
<div class="btn-group">
<a class="btn btn-danger" id="resetToDefaults" href="#" style="padding-top:5px">Reset To Default Prop Types</a>
</div>
<div class="sub-container" id="remove-prop-types" style="height:400px;overflow:auto">
<h4>Custom Props</h4>
<table id="customtable" class="table table-striped table-condensed">
<!--Custom Prop Types available to Remove-->
</table>
<h4>Default Props</h4>
<table id="defaulttable" class="table table-striped table-condensed">
<tbody>
<tr><td>No Default Props</td></tr>
</tbody>
<!--Default Prop Types available to Remove-->
</table>
<div class="well sub-container">
<label>To copy a prop, change its title.</label>
</div>
<!--<div class="well sub-container">-->
<!--This is removed because resetting prop types would cause all given props to be deleted, which is probably not what the users want. Un-comment to re-enable.-->
<!--<div class="row-fluid">-->
<!--<p class="span6">Remove custom props and only display the default set.</p>-->
<!--<a class="span3 btn btn-small" id="resetToDefaults" href="#">Reset Props</a>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</div>
</body>

<script type="text/javascript" charset="utf-8" src="vendor/jquery-1.7.2/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8" src="vendor/bootstrap/bootstrap-dropdown.js"></script>
<script type="text/javascript" charset="utf-8" src="js/make_http_request.js"></script>
<script type="text/javascript" charset="utf-8" src="js/admin_main.js"></script>
<!--<script type="text/javascript" charset="utf-8" src="vendor/jquery-1.7.2/jquery.min.js"></script>-->
<!--<script type="text/javascript" charset="utf-8" src="vendor/bootstrap/bootstrap-dropdown.js"></script>-->
<!--<script type="text/javascript" charset="utf-8" src="js/make_http_request.js"></script>-->
<!--<script type="text/javascript" charset="utf-8" src="js/admin_main.js"></script>-->

</html>
<script type="text/javascript" charset="utf-8" src="dist/admin.min.js"></script>

</html>
4 changes: 0 additions & 4 deletions applications/props/props-app/canvas.html
View file

This file was deleted.

525 changes: 525 additions & 0 deletions applications/props/props-app/dist/admin.js
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions applications/props/props-app/dist/admin.min.js
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions applications/props/props-app/dist/all.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit c7a04e7

Please sign in to comment.