Skip to content

Commit

Permalink
New functions have been created
Browse files Browse the repository at this point in the history 
Functions : Create room ,create text document
  • Loading branch information
@akoumi01
akoumi01 committed May 19, 2015
1 parent 094588b commit 445608c
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 37 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<script src="js/angular-route.js"></script>
<script src="js/localStorageModule.js"></script>
<script src="webPlatformApp.js"></script>
<script src="servises.js"></script>
<script src="steam.js"></script>


</body>
Expand Down
2 changes: 2 additions & 0 deletions servises.js → steam.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
var app=angular.module('steam', ['ngRoute','LocalStorageModule']);

app.factory('steam', function($http, localStorageService) {
var baseurl, handle_request, headers, loginp, restapi;
baseurl = 'http://dev-back1.techgrind.asia/';
Expand Down
137 changes: 102 additions & 35 deletions views/home.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,98 @@
<div class="container">
<div class="modal fade" id="uploadFileModal">
<div class="modal-dialog " >
<div class="modal-content panel-primary ">
<div class="modal-header panel-heading" >
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Add New File</h3>
</div>
<div class="modal-body">
<form id="file-form" action="" method="post" enctype="multipart/form-data" style="visibility: hidden;">
<input id="file" type="file" name="file" size="50" onchange="$('#fileName').val($(this).val());"/>
</form>
<form role="form">
<div class="input-group">
<span class="input-group-btn">
<button class="btn btn-danger" type="button" onclick="$('#file').click();"> <span class="glyphicon glyphicon-folder-open"></span> Browse File
</button>
</span>
<input type="text" class="form-control" value="No file selected"id="fileName"> <span class="input-group-btn"></span>
</div>
<div class="modal-footer">
<button id="upload-button" type="submit" class="btn btn-success btn-lg" ng-click="createNewFile()">Add File</button>
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Cancel</button> </div>
</form>
</div>
</div>
</div>
</div>
<div class="modal fade" id="createRoomModal">
<div class="modal-dialog " >
<div class="modal-content panel-primary ">
<div class="modal-header panel-heading" >
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Create New Room</h3>
</div>
<div class="modal-body">
<form role="form" name="addRoomForm">
<div class="input-group">
<span class="input-group-btn">
<button ng-disabled="addRoomForm.roomName.$error.required" id="createRoombtn" class="btn btn-info" type="button" ng-click="createRoom();">Add Room</button>
</span>
<input type="text" class="form-control" ng-model="roomName" name="roomName" id="roomName" placeholder="Room name..." required>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Cancel</button> </div>
</form>
</div>
</div>
</div>
</div>
<div class="modal fade" id="createNewTextDocumentModal">
<div class="modal-dialog " >
<div class="modal-content panel-primary ">
<div class="modal-header panel-heading" >
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Create New Text Documet</h3>
</div>
<div class="modal-body">
<form role="form" name="newTextDocumentForm">
<div class="form-group">
<h4><label for="content">Document Name:</label></h4>
<input type="text" class="form-control input-lg" ng-model="newtxtFileName" name="newtxtFileName" id="newtxtFileName" placeholder="Enter Document name..." required>
</div>
<div class="form-group">
<h4><label for="content">Document Content:</label></h4>
<textarea ng-model="newtxtContent" class="form-control input-lg" rows="5" id="newtxtContent" name="newtxtContent" placeholder="Enter Document Content..." required></textarea>
</div>
<div class="modal-footer">
<button ng-disabled="(newTextDocumentForm.newtxtFileName.$error.required)||(newTextDocumentForm.newtxtContent.$error.required)" type="submit" class="btn btn-success btn-lg" ng-click="createNewTextFile()">Save</button>
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Cancel</button> </div>
</form>
</div>
</div>
</div>
</div>












<div class="row">
<div class="col-sm-4" >
<div class="col-sm-3" >
<div class="panel panel-success">
<div class="panel-heading">
<h3 class="panel-title"><b>Navigation pane</b></h3>
Expand All @@ -12,7 +104,7 @@ <h3 class="panel-title"><b>Navigation pane</b></h3>
</div>
</div>
</div>
<div class="col-sm-8" >
<div class="col-sm-9" >
<div ng-if="Data.object.class == 'Document'">
<div ng-if="Data.object.mime_type == 'image/png'">
<div class="panel panel-success">
Expand All @@ -31,24 +123,13 @@ <h3 class="panel-title"><h3><b>{{Data.object.name}}</b></h3></h3>
</div>
<div class="panel-body">
<form role="form">
<div class="form-group">
<h4><label for="name">Documet Name:</label></h4>
<input type="text" class="form-control input-lg" id="name" value="{{Data.object.name}}" required>
</div>
<div class="form-group">
<h4><label for="title">Document Title:</label></h4>
<input type="text" class="form-control input-lg" id="title" value="{{Data.object.title}}" required>
</div>
<div class="form-group">
<h4><label for="description">Document description:</label></h4>
<input type="text" class="form-control input-lg" id="description" value="{{Data.object.description}}" required>
</div>
<h3><label for="title">Document Title:{{Data.object.title}}</label></h3>
<div class="form-group">
<h4><label for="content">Document Content:</label></h4>
<textarea class="form-control input-lg" rows="5" id="content">{{Data.object.content}}</textarea>
</div>
<div class="form-group">
<button type="submit" class="btn btn-success btn-lg">Save</button>
<button type="submit" class="btn btn-success btn-lg" ng-click="saveText();">Save</button>
</div>
</form>
</div>
Expand All @@ -58,7 +139,11 @@ <h4><label for="content">Document Content:</label></h4>
<div ng-if="Data.object.class == 'Room'">
<div class="panel panel-success">
<div class="panel-heading">
<h3 class="panel-title"><b>{{Data.object.name}}</b> </h3>
<h3 class="panel-title"><b>{{Data.object.name}}</b> </h3><br>
<a ng-hide="isHome();"data-toggle="modal" data-target="#uploadFileModal"class="btn btn-success btn-md">Add new File</a>
<a ng-hide="isHome();" class="btn btn-success btn-md" data-toggle="modal" data-target="#createNewTextDocumentModal">Create new text file</a>

<a class="btn btn-success btn-md" data-toggle="modal" data-target="#createRoomModal">Create new Room</a>
</div>
<div class="panel-body">
<div class="table-responsive">
Expand Down Expand Up @@ -103,25 +188,7 @@ <h1 ng-hide="Data.inventory.length">The Room is empty!!!!</h1><br ng- hide="Da
</tr>
</tbody>
</table>
</div>
<div class="input-group">
<span class="input-group-btn">
<button class="btn btn-info" type="button">Add Room</button>
</span>
<input type="text" class="form-control" placeholder="Room name...">
</div>
<form action="http://localhost:8080/collaboration-platform/rest/files/upload" method="post" enctype="multipart/form-data" role="form" ng-show="(Data.environment.name!='root-room')">
<input type="file" style="visibility:hidden;"onchange="$('#fileName').val($(this).val());" id="file">
<div class="input-group">
<span class="input-group-btn">
<button class="btn btn-danger" type="button" onclick="$('#file').click();"><span class="glyphicon glyphicon-folder-open"></span> Browse File</button>
</span>
<input type="text" class="form-control" value="No file selected"id="fileName"> <span class="input-group-btn">
<button type="submit" class="btn btn-success" type="button">Add File</button>
</span>

</div>
</form>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h3 class="modal-title">#</h3>
<form role="form" name="SingInForm">
<div class="form-group">
<h4><label for="userSignIn">Nickname</label></h4>
<input type="text" class="form-control input-lg" id="userSignIn" size="8" placeholder="Email.." name="userSignIn" ng-model="userSignIn" required>
<input type="text" class="form-control input-lg" id="userSignIn" size="8" placeholder="Nickname...." name="userSignIn" ng-model="userSignIn" required>
<span style="color:red" ng-show="SingInForm.userSignIn.$dirty && SingInForm.userSignIn.$invalid">
<span ng-show="SingInForm.userSignIn.$error.required">Nickname is required.</span>
<span ng-show="SingInForm.userSignIn.$error.email">Invalid Nickname address.</span>
Expand Down

0 comments on commit 445608c

Please # to comment.