ver 2.2

JTosAddon · Jan 8, 2017 · 7728b13 · 7728b13
1 parent 8823913
commit 7728b13
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 16 deletions.
diff --git a/css/main.css b/css/main.css
@@ -1,6 +1,8 @@
 html, body {
 	height: 100%;
 	margin: 0; padding: 0;
+	background-image: '../img/fuckinOnion.png'
+
 }
 
 #wrapper {
@@ -44,4 +46,9 @@ html, body {
   border-radius: 50%;
   box-shadow:0 0px 0px 0 rgba(0,0,0,0);
   background-color:rgba(0,0,0,0)
+}
+#search {
+	width: 24px;
+	height: auto;
+	float:left;
 }
diff --git a/img/arrow-up.png b/img/arrow-up.png
diff --git a/img/fuckinOnion.png b/img/fuckinOnion.png
diff --git a/img/fuckinOnion2.png b/img/fuckinOnion2.png
diff --git a/img/search.png b/img/search.png
diff --git a/index.html b/index.html
@@ -10,20 +10,21 @@
 
 	</head>
 	<body style="font-family:'メイリオ',Meiryo UI;" ng-cloak ng-controller="TabController as vm">
-
 		<div id="wrapper">
 			<div id="body">
 				<div class="content">
-					<md-tabs md-stretch-tabs md-selected="vm.selectedIndex">
+					<md-tabs data-ng-show="vm.showTab()" md-stretch-tabs md-border-bottom  md-selected="vm.selectedIndex">
 						<md-tab label="Settings"></md-tab>
 						<md-tab label="IToS" ng-disabled="!vm.isValidDirectory();"></md-tab>
 						<md-tab label="JToS" ng-disabled="!vm.isValidDirectory();"></md-tab>
 					</md-tabs>
+					<div id="top" ></div>
 
 					<div id="content" ui-view flex></div>
 				</div>
 			</div>
 			<div id="footer" md-whiteframe="3">
+				<md-button  class="md-raised" style="float:left"data-ng-click="vm.jumpTo()">Go TOP</md-button>
 				<md-button data-ng-click="vm.launchGame();" class="md-raised">Open ToS JP Site</md-button>
 			</div>
 		</div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-of-savior-addon-manager",
-  "version": "0.2.2.β",
+  "version": "0.2.2",
   "description": "An addon manager for Tree of Savior.",
   "main": "main.js",
   "scripts": {

diff --git a/scripts/browse/addon.directive.js b/scripts/browse/addon.directive.js
@@ -5,7 +5,7 @@
 		.module('app')
 		.directive('addon', addon);
 
-	function addon($log, $compile, $sce, installer, readmeretriever) {
+	function addon($log, $compile, $sce,  $location,  $anchorScroll,installer, readmeretriever) {
 		var directive = {
 			scope: {},
 			restrict: 'E',
@@ -77,6 +77,8 @@
 			scope.closeReadme = function(addon){
 				$log.info("Closing readme");
 				addon.isShowReadme = false
+				$location.hash(addon.name);
+				$anchorScroll();		
 			}
 		}
 	}

diff --git a/scripts/services/addonretrieverJP.service.js b/scripts/services/addonretrieverJP.service.js
@@ -5,7 +5,7 @@
 		.module('app')
 		.factory('addonretrieverJP', addonretrieverJP);
 
-	addonretrieverJP.$inject = ['$log', '$http', 'settings'];
+	addonretrieverJP.$inject = ['$log', '$http', 'settings', '$location',  '$anchorScroll'];
 
 	function addonretrieverJP($log, $http, settings) {
 		var masterSources = "https://raw.githubusercontent.com/JTosAddon/Addons/master/addons.json";

diff --git a/scripts/tab/tab.controller.js b/scripts/tab/tab.controller.js
@@ -5,10 +5,10 @@
 		.module('app')
 		.controller('TabController', TabController);
 
-	TabController.$inject = ['$scope', '$location', 'settings'];
+	TabController.$inject = ['$scope', '$location',  '$anchorScroll','settings'];
 
 	/* @ngInject */
-	function TabController($scope, $location, settings) {
+	function TabController($scope, $location, $anchorScroll,settings) {
 		var vm = this;
 
 		vm.selectedIndex = 0;
@@ -22,11 +22,6 @@
 		};
 
 		$scope.$watch('vm.selectedIndex', function(current, old) {
-			if(!settings.isLoadedJToSData){
-				$location.url('/settings');
-				return;				
-			}
-
 			switch(current) {
 				case 0:
 					$location.url('/settings');
@@ -41,5 +36,12 @@
 					break;
 			}
 		});
+		vm.jumpTo = function () {
+ 			$location.hash('top');
+			$anchorScroll();
+		}
+		vm.showTab = function(){
+			return settings.isLoadedJToSData;
+		};
 	}
 })();
diff --git a/views/addon.html b/views/addon.html
@@ -1,4 +1,4 @@
-<md-card md-whiteframe="5">
+<md-card md-whiteframe="5" id="{{vm.addon.name}}">
 	<md-card-title>
 		<md-card-title-text>
 			<span class="md-headline">{{vm.addon.name}}
@@ -32,9 +32,9 @@
 
 		<!--<md-button style="background-color:#55acee" >Twitter</md-button>-->
 		<!--<md-button data-ng-click="openWebsite(vm.addon);" class="md-raised">GitHub</md-button>-->
-		<md-button data-ng-click="install(vm.addon);" class="md-raised" data-ng-class="{'md-warn': vm.addon.failedInstall}" data-ng-show="!vm.addon.isDownloading && !vm.addon.isInstalled">Install</md-button>
+		<md-button data-ng-click="install(vm.addon);" class="md-raised md-primary" data-ng-class="{'md-warn': vm.addon.failedInstall}" data-ng-show="!vm.addon.isDownloading && !vm.addon.isInstalled">Install</md-button>
 		<md-button data-ng-click="update(vm.addon);" class="md-raised md-accent" data-ng-class="{'md-warn': vm.addon.failedInstall}" data-ng-show="vm.addon.isUpdateAvailable && vm.addon.isInstalled">Update</md-button>
-		<md-button data-ng-click="uninstall(vm.addon);" class="md-raised" data-ng-show="vm.addon.isInstalled && !vm.addon.failedInstall">Uninstall</md-button>
+		<md-button data-ng-click="uninstall(vm.addon);" class="md-raised md-warn" data-ng-show="vm.addon.isInstalled && !vm.addon.failedInstall">Uninstall</md-button>
 		<md-progress-circular md-mode="indeterminate" data-ng-show="vm.addon.isDownloading"></md-progress-circular>
 	</md-card-actions>
 </md-card>
diff --git a/views/browse.html b/views/browse.html
@@ -1,7 +1,8 @@
 
 <div layout="column" layout-padding>
 	<md-input-container class="md-block">
-		<label>Search</label>
+
+		<label><img id = "search"src="img/search.png"  alt="search">Search</label>
 		<input data-ng-model="browseController.searchQuery">
 	</md-input-container>
 	<div layout="row">