From 540428ae87fbe3a869e40e5dc95c384931463547 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 28 Feb 2016 21:16:48 +0100 Subject: [PATCH] Did some simple work on more Admin commands for getting teams, will have to work on it more later --- client/app/css/teambuilder.styl | 4 ++++ client/views/teambuilder/teams.jade | 8 +++++++- public/css/main.css | 3 ++- public/js/app.js | 4 ---- public/js/templates.js | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/client/app/css/teambuilder.styl b/client/app/css/teambuilder.styl index c07617f..20ed10a 100644 --- a/client/app/css/teambuilder.styl +++ b/client/app/css/teambuilder.styl @@ -2,6 +2,10 @@ $header = 50px $pokemon-list-height = 50px // TODO: Make this a global style +.Team-Admin + border: 1px solid black; + width: 40%; + margin-left: 10px; .teambuilder input .teambuilder select box-sizing border-box diff --git a/client/views/teambuilder/teams.jade b/client/views/teambuilder/teams.jade index 08620e1..215ce6f 100644 --- a/client/views/teambuilder/teams.jade +++ b/client/views/teambuilder/teams.jade @@ -5,5 +5,11 @@ h2 Your teams .button.button_blue.add-new-team Add new team .button.import-team Import + if window.PokeBattle.username == "Deukhoofd" || window.PokeBattle.username == "thesuzerain" - .button.get-teams Get all teams + div.Team-Admin + h5 Admin Commands + .button.get-teams Get all teams + br + | Get teams from user + input(type=text) diff --git a/public/css/main.css b/public/css/main.css index 961807f..e1465e1 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -450,7 +450,8 @@ h1{font-family:"PT Sans Narrow","Helvetica Neue",sans-serif;font-size:2em;font-w 100%{-webkit-transform:translate(200%,100%);-moz-transform:translate(200%,100%);-o-transform:translate(200%,100%);-ms-transform:translate(200%,100%);transform:translate(200%,100%)} }@keyframes sandstorm{0%{-webkit-transform:translate(0,0);-moz-transform:translate(0,0);-o-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)} 100%{-webkit-transform:translate(200%,100%);-moz-transform:translate(200%,100%);-o-transform:translate(200%,100%);-ms-transform:translate(200%,100%);transform:translate(200%,100%)} -}.teambuilder input,.teambuilder select{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;height:28px} +}.Team-Admin{border:1px solid #000;width:40%;margin-left:10px} +.teambuilder input,.teambuilder select{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;height:28px} .teambuilder .selectize-input input{height:18px} .teambuilder{position:absolute;top:0;bottom:0;left:0;right:0;} .teambuilder select,.teambuilder input{margin-bottom:0 !important;width:100%} diff --git a/public/js/app.js b/public/js/app.js index b8739b3..4ce0c20 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -6126,14 +6126,10 @@ }); attachSelectize(this.$el.find(".selected_item")); filtertierbox = this.$el.find(".filter-tier-box")[0]; - console.log(filtertierbox); - console.log(this.tierFilterBool); if (this.tierFilterBool === false) { - console.log("false"); filtertierbox.checked = true; this.tierFilterBool = true; } else if (this.tierFilterBool === true) { - console.log("true"); filtertierbox.checked = false; this.tierFilterBool = false; } diff --git a/public/js/templates.js b/public/js/templates.js index d4722d0..b7598f6 100644 --- a/public/js/templates.js +++ b/public/js/templates.js @@ -1083,7 +1083,7 @@ var locals_ = (locals || {}),team = locals_.team,window = locals_.window;buf.pus this["JST"]["teambuilder/teams"] = function anonymous(locals /**/) { var buf = []; -var locals_ = (locals || {}),teams = locals_.teams,window = locals_.window;buf.push("

Your teams

"); +var locals_ = (locals || {}),teams = locals_.teams,window = locals_.window,text = locals_.text;buf.push("

Your teams

"); // iterate teams ;(function(){ var $$obj = teams; @@ -1109,7 +1109,7 @@ buf.push(null == (jade.interp = window.JST['teambuilder/team']({team: team, wind buf.push("
Add new team
Import
"); if ( window.PokeBattle.username == "Deukhoofd" || window.PokeBattle.username == "thesuzerain") { -buf.push("
Get all teams
"); +buf.push("
Admin Commands
Get all teams

Get teams from user
"); };return buf.join(""); };