Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update from upstream #1

Merged
merged 7 commits into from
May 11, 2018
Merged

update from upstream #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f12caf5
add upload torrent button
ti Apr 23, 2018
ad04f59
add upload torrent button js/css
ti Apr 23, 2018
9f459fc
change to adpater upload torrent file feature
ti Apr 23, 2018
7f386a8
only enable file button when the input is empty
ti Apr 23, 2018
1a59b89
new feature: drop and upload a torrent file
ti Apr 25, 2018
bada577
only when drop file into omni box can upload
ti Apr 25, 2018
1a741e3
merge #225, adds torrent upload (via upload button and drag and drop)…
jpillora Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions static/files.go
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions static/files/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,46 @@ table.tcld .name {
.uploads .upload .size {
width: 100px;
}

[onfileclick] {
cursor: pointer;
}

[ondropfile] {
position: relative;
}

[ondropfile] .file-drop-cover {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 102%;
margin-top: 1%;
margin-left: -1%;
pointer-events: none;
background: rgba(173, 216, 230, 0.5);
opacity: 0;
transition: opacity ease 0.3s;
z-index: 5;
overflow: hidden;
}

[ondropfile] .file-drop-cover.shown {
opacity: 1;
}

[ondropfile] .file-drop-cover .dots {
height: 100%;
border: 1px dotted #333;
border-radius: 3px;
}

[ondropfile] .file-drop-cover .dots .msg {
position: absolute;
text-align: center;
font-size: 2em;
left: 0;
top: 30px;
width: 100%;
}
68 changes: 37 additions & 31 deletions static/files/css/sections/omni.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,64 @@


.omni {
margin-top: 5px;
margin-top: 5px;
}

.omni .buttons {
margin-top: 5px;
text-align: center;
margin-top: 5px;
text-align: center;
}

.omni .results {
max-height: 200px;
overflow-y: auto;
border: 1px solid rgba(0,0,0,.15);
margin-top: 5px;
border-radius: 4px;
max-height: 200px;
overflow-y: auto;
border: 1px solid rgba(0, 0, 0, 0.15);
margin-top: 5px;
border-radius: 4px;
}

.omni .results .name {
/*font-size: .75em;*/
text-align: right;
/*font-size: .75em;*/
text-align: right;
}

.omni .results .users {
width: 75px;
text-align: center;
width: 75px;
text-align: center;
}
.omni .results .seeds {
color: #5bbd72;
color: #5bbd72;
}

.omni .results .peers {
color: rgb(176, 127, 20);
color: rgb(176, 127, 20);
}

.omni .results .loadmore {
text-align: right;
text-align: right;
}

.omni .search select {
padding: 0 10px;
margin-top: 0px;
border-radius: 4px;
background: #D58686;
color: #888;
border: none;
outline: none;
height: 31px;
display: inline-block;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
cursor: pointer;
padding: 0 10px;
margin-top: 0px;
border-radius: 4px;
background: #d58686;
color: #888;
border: none;
outline: none;
height: 31px;
display: inline-block;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
cursor: pointer;
}
.omni .form {
margin-top: 5px;
margin-top: 5px;
}

.icon-wrapper {
z-index: 6;
position: absolute;
right: 0;
padding: 10px;
cursor: pointer;
}
4 changes: 2 additions & 2 deletions static/files/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
</head>

<body class="app">
<div ng-cloak class="cage">
<div ng-cloak class="cage" ondropfile="uploadTorrent($event)" placeholder="Drop torrent files here">
<div ng-if="!connected" class="connect-warning ui inverted vertical masthead center aligned segment">
<div class="ui text container">
<h1 class="ui inverted header">
Disconnected
{{ hasConnected ? 'Disconnected' : 'Connecting' }}
</h1>
<h1 class="ui inverted header">
<i class="red lightning icon"></i>
Expand Down
3 changes: 2 additions & 1 deletion static/files/js/config-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ app.controller("ConfigController", function($scope, $rootScope, storage, api) {
$scope.edit = b === undefined ? !$scope.edit : b;
};
$scope.submitConfig = function() {
api.configure($rootScope.state.Config);
var data = JSON.stringify($rootScope.state.Config);
api.configure(data);
};
});
Loading