Browse Source

Updater css

Size calc
pull/51/merge
Ruud 14 years ago
parent
commit
fcce56c083
  1. 3
      couchpotato/core/event.py
  2. 3
      couchpotato/core/plugins/movie/static/movie.css
  3. 2
      couchpotato/core/plugins/movie/static/movie.js
  4. 8
      couchpotato/core/providers/base.py
  5. 2
      couchpotato/static/style/main.css

3
couchpotato/core/event.py

@ -27,9 +27,6 @@ def addEvent(name, handler, priority = 0):
return h return h
if name == 'app.initialize':
print 'test', priority
e.handle(createHandle, priority = priority) e.handle(createHandle, priority = priority)
def removeEvent(name, handler): def removeEvent(name, handler):

3
couchpotato/core/plugins/movie/static/movie.css

@ -1,6 +1,7 @@
/* @override /* @override
http://localhost:5000/static/movie_plugin/movie.css http://localhost:5000/static/movie_plugin/movie.css
http://192.168.1.20:5000/static/movie_plugin/movie.css http://192.168.1.20:5000/static/movie_plugin/movie.css
http://127.0.0.1:5000/static/movie_plugin/movie.css
*/ */
.movies { .movies {
@ -186,7 +187,7 @@
width: 120px; width: 120px;
} }
.movies .options .releases .name { .movies .options .releases .name {
width: 420px; width: 360px;
overflow: hidden; overflow: hidden;
text-align: left; text-align: left;
padding: 0 10px; padding: 0 10px;

2
couchpotato/core/plugins/movie/static/movie.js

@ -223,6 +223,7 @@ var ReleaseAction = new Class({
new Element('div.item.head').adopt( new Element('div.item.head').adopt(
new Element('span.name', {'text': 'Release name'}), new Element('span.name', {'text': 'Release name'}),
new Element('span.quality', {'text': 'Quality'}), new Element('span.quality', {'text': 'Quality'}),
new Element('span.size', {'text': 'Size (MB)'}),
new Element('span.age', {'text': 'Age'}), new Element('span.age', {'text': 'Age'}),
new Element('span.score', {'text': 'Score'}), new Element('span.score', {'text': 'Score'}),
new Element('span.provider', {'text': 'Provider'}) new Element('span.provider', {'text': 'Provider'})
@ -234,6 +235,7 @@ var ReleaseAction = new Class({
}).adopt( }).adopt(
new Element('span.name', {'text': self.get(release, 'name'), 'title': self.get(release, 'name')}), new Element('span.name', {'text': self.get(release, 'name'), 'title': self.get(release, 'name')}),
new Element('span.quality', {'text': release.quality.label}), new Element('span.quality', {'text': release.quality.label}),
new Element('span.size', {'text': (self.get(release, 'size') || 'unknown')}),
new Element('span.age', {'text': self.get(release, 'age')}), new Element('span.age', {'text': self.get(release, 'age')}),
new Element('span.score', {'text': self.get(release, 'score')}), new Element('span.score', {'text': self.get(release, 'score')}),
new Element('span.provider', {'text': self.get(release, 'provider')}), new Element('span.provider', {'text': self.get(release, 'provider')}),

8
couchpotato/core/providers/base.py

@ -76,19 +76,19 @@ class YarrProvider(Provider):
def parseSize(self, size): def parseSize(self, size):
sizeRaw = size.lower() sizeRaw = size.lower()
size = re.sub(r'[^0-9.]', '', size).strip() size = float(re.sub(r'[^0-9.]', '', size).strip())
for s in self.sizeGb: for s in self.sizeGb:
if s in sizeRaw: if s in sizeRaw:
return float(size) * 1024 return int(size) * 1024
for s in self.sizeMb: for s in self.sizeMb:
if s in sizeRaw: if s in sizeRaw:
return float(size) return int(size)
for s in self.sizeKb: for s in self.sizeKb:
if s in sizeRaw: if s in sizeRaw:
return float(size) / 1024 return int(size) / 1024
return 0 return 0

2
couchpotato/static/style/main.css

@ -213,7 +213,7 @@ form {
color: #b1d8dc; color: #b1d8dc;
} }
.header .message { .header .message.update {
text-align: center; text-align: center;
position: relative; position: relative;
top: -70px; top: -70px;

Loading…
Cancel
Save