2,377 public/javascripts/bootstrap.js
View file

Large diffs are not rendered by default.

7 public/javascripts/controllers.js
View file
@@ -9,10 +9,12 @@ function PollListCtrl2($scope) {

function PollListCtrl($scope, Poll,$http) {
$scope.polls = Poll.query();
console.log(Poll);
var refresh = function(){

$http.get('/polls/polls').success(function(response){
$scope.polls = response;
console.log(response);
console.log("clean");

});
@@ -47,10 +49,6 @@ function PollListCtrl2($scope) {
$scope.cancel = function() {
$scope.showModal = false;
};




$scope.logout =function(){
if (confirm("Seguro que desea salir?")) {
$http.get('/logout/');
@@ -525,6 +523,7 @@ function PollEditCtrl($scope, $location, Poll, Poll2, $http) {
function PollNewCat($scope, $location,Poll){

var _cat = $scope.catnew;

$scope.createCat = function() {

console.log("Cat Creada");
1 public/javascripts/ng-tags-input.min.js
View file

This file was deleted.

79 public/partials/list.html
View file
@@ -50,9 +50,12 @@ <h4 class="modal-title" id="myModalLabel">Nueva Categoría</h4>
<div class="row">
<div class="col-xs-6">
<a href="#/new" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span>Nueva Encuesta</a>
<a href="#/newcat" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span>Nueva Categoría</a>
</div>

<button class="btn btn-default" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
<span class="glyphicon glyphicon-plus"></span>Nueva Categoría
</button>
</div>


<!-- <div class="col-xs-2">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#myModal">
@@ -118,53 +121,35 @@ <h6>
</button>
</div>
</td>

</tr>

<md-chips ng-model="ctrl.editableFruitNames" readonly="ctrl.readonly" md-removable="ctrl.removable"
md-enable-chip-edit="true"></md-chips>

<!--<div ng-repeat="poll in polls">
<nav class="navbar navbar-default">
<div class="container-fluid">
Brand and toggle get grouped for better mobile display
<div class="navbar-header">
<a class="navbar-brand" href="#">{{poll.question}}</a>
</div>

Collect the nav links, forms, and other content for toggling
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
</ul>
</div>
</div>
</nav>-->


<!--<div class="input-group">
{{poll.question}}
<span class="input-group-btn">
<button type="button" class="btn btn-default btn-xs" aria-label="Left Align">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</button>
<button type="button" class="btn btn-default btn-xs" aria-label="Left Align">
<span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
</button>
</span>
</div>-->
<!--<a href="#/pollpop/{{poll._id}}"></a>
<div align="right">
<button type="button" class="btn btn-default btn-xs" aria-label="Left Align">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</button>
<button type="button" class="btn btn-default btn-xs" aria-label="Left Align">
<span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
</button>
</div>-->
<!--<a href="/lolcito/{{poll._id}}">{{poll.question}}</a>-->
</tr>

<tr>
<td> </td>
<td style="width:30%">
<div class="collapse" id="collapseExample" class="col-xs-3">
<div class="row">

<form role="form" ng-submit="addCategoria()">
<div class="col-md-6">
<input type="text" class="form-control" id="pollcat" ng-attr-placeholder="Ingresa tu nueva Categoría">
</div>
<div class="col-md-1">
<button class="btn btn-default pull-left" type="submit" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">Agregar</button>
</div>
</form>
</div>
</div>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
</tr>

</table>

</div>
<p>&nbsp;</p>
2 views/index.jade
View file
@@ -11,7 +11,7 @@ html(lang='en', ng-app='pollz')
script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js')
script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular-resource.min.js')
script(src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js')
script(src='//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js')
script(src='/javascripts/bootstrap.js')
script(src='/socket.io/socket.io.js')
script(src='/javascripts/app.js')
script(src='/javascripts/services.js')
2 views/mos.jade
View file
@@ -14,7 +14,7 @@ html(lang='en', ng-app='pollz')
script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js')
script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular-resource.min.js')
script(src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js')
script(src='//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js')
script(src='//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js')
script(src='/socket.io/socket.io.js')
script(src='/javascripts/app.js')
script(src='/javascripts/services.js')
2 views/prueba.jade
View file
@@ -15,7 +15,7 @@ html(lang='en', ng-app='pollz')
script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js')
script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular-resource.min.js')
script(src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js')
script(src='//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js')
script(src='//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js')
script(src='/socket.io/socket.io.js')
script(src='/javascripts/app.js')
script(src='/javascripts/services.js')