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.

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

Couchpotato Module #169

Merged
merged 42 commits into from
Jul 16, 2012
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d949876
Initial CouchPotato Implementation.
gugahoi Jan 11, 2012
e6e4c1a
Merge remote-tracking branch 'origin/master' into couchpotato
Mar 28, 2012
afd5a42
Initial implementation of CP-search
Mar 29, 2012
30703b5
Merge remote-tracking branch 'upstream/master'
gugahoi Jun 24, 2012
49dd8b6
Merge remote-tracking branch 'origin/master' into couchpotato
gugahoi Jun 24, 2012
66a57d4
Remove recommandations
gugahoi Jun 24, 2012
bd28a74
Merge remote-tracking branch 'upstream/master' into couchpotato
gugahoi Jun 25, 2012
6976341
Merge remote-tracking branch 'upstream/master'
gugahoi Jun 25, 2012
b870980
Restored basic CP functionality
gugahoi Jun 25, 2012
b698fb0
Added "add to cp" functions
gugahoi Jun 25, 2012
edf1181
Successfully add/delete movies from queue
gugahoi Jun 25, 2012
4146092
Fixed missing posters on searches
gugahoi Jun 25, 2012
09fd181
Added background to buttons
gugahoi Jun 25, 2012
2cf36ea
Added settings and refresh function
gugahoi Jun 25, 2012
0e3ccc2
Initial settings page
gugahoi Jun 26, 2012
1622629
Moved menu around
gugahoi Jun 26, 2012
b43a8fe
Shutdown and restart js implementations
gugahoi Jun 26, 2012
891b2de
compact view
gugahoi Jun 26, 2012
61eb4d2
Fix when adding movies with '/' character
gugahoi Jun 26, 2012
aba5c90
Movie info functions
gugahoi Jun 26, 2012
00754ee
Improving info view
gugahoi Jun 26, 2012
d4306e7
improved styling of things
gugahoi Jun 26, 2012
e4b72b1
Use Player.GoTo rather than Player.Open for playlists
N3MIS15 Jun 30, 2012
71ec645
Merge remote-tracking branch 'upstream/master' into couchpotato
gugahoi Jun 30, 2012
b61888e
Added search button to search template
gugahoi Jun 30, 2012
a5ea41c
Added option to choose profile when adding a movie
gugahoi Jun 30, 2012
3ab3453
Qulaity profile now set on results
gugahoi Jun 30, 2012
0e45eb1
Added image popups
gugahoi Jun 30, 2012
5fe002e
fixed server settings opacity
gugahoi Jun 30, 2012
24d75eb
Merge remote-tracking branch 'upstream/master'
gugahoi Jun 30, 2012
99b7262
Merge remote-tracking branch 'origin/master' into couchpotato
gugahoi Jun 30, 2012
219f988
better popup
gugahoi Jun 30, 2012
f25da57
Added quality profile drop down to movie info
gugahoi Jul 1, 2012
588be6e
Added log view
gugahoi Jul 1, 2012
3d95c89
loading gifs and font sizes
gugahoi Jul 1, 2012
e572c6e
Added options menu to movie info view
gugahoi Jul 1, 2012
f82e89f
updated AUTHORS to reflect N3MISI5 becoming a repo collaborator
mrkipling Jul 6, 2012
965ec38
Merge pull request #168 from N3MIS15/player_goto
N3MIS15 Jul 6, 2012
a86d313
Merge branch 'kiosk'
gugahoi Jul 6, 2012
a544798
Merge branch 'couchpotato' of https://github.com/gugahoi/maraschino.git
N3MIS15 Jul 12, 2012
8e1f9c9
cache couchpotato images
N3MIS15 Jul 12, 2012
1a9f4e0
minor fixes
gugahoi Jul 16, 2012
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
Prev Previous commit
Next Next commit
compact view
  • Loading branch information
gugahoi committed Jun 26, 2012
commit 891b2de024058582654e32f053e8bb9fa417b349
4 changes: 1 addition & 3 deletions modules/couchpotato.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,11 @@ def xhr_couchpotato(status=False):
except:
couchpotato = None

compact_view = get_setting_value('couchpotato_compact') == '1'

logger.log('CouchPotato :: Finished fetching wanted list', 'INFO')
return render_template(template,
url=couchpotato_url(),
couchpotato=couchpotato,
compact_view=compact_view,
compact_view=get_setting_value('couchpotato_compact') == '1',
)


Expand Down
38 changes: 24 additions & 14 deletions static/less/module-couchpotato.less
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,35 @@
#cp_content {
max-height: 264px;
overflow-x: hidden;

&.compact {
div.image{
display: none;
}
.movie {
height: 20px;
}
span {
line-height: 20px;
&.tagline{
display: none;
}
&.quality {
display: block;
float: right;
font-size: 0.5em;
}
}
}
.movie {
background: url('/@{webroot}/images/alpha/fff_10.png');
display: inline-block;
margin: 5px 0 0 4px;
margin: 5px;
text-align:justify;
color: #ccc;
vertical-align: middle;
height: 60px;
width: 96%;
padding: 5px;
width: 95%;
padding: 6px;
overflow: hidden;
position: relative;
z-index: 10;
Expand Down Expand Up @@ -127,24 +145,16 @@
}
}

span.text {
span {
display: inline;
padding-bottom: 5px;

&.plot {
display: none;
}

a.more {
cursor: pointer;
}
}
}
div.options {
opacity: 0;
-moz-opacity: 0;
filter:alpha(opacity=0);
top: -65px;
top: -70px;
left: 10px;
height: 0px;
margin: 0px;
Expand Down
7 changes: 4 additions & 3 deletions templates/couchpotato.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block couchpotato_content %}

<div id="cp_content">
<div id="cp_content" {%if compact_view %}class="compact"{%endif%}>
{% for item in couchpotato %}
<div class="movie" id="{{item.library.identifier}}">
<div class="{{item.releases.status}}"></div>
Expand All @@ -12,9 +12,10 @@
/>
<span class="profile" title="CouchPotato quality profile">{{item.profile.label}}</span>
</div>
<span class="title text"><h3>{{item.library.titles[0].title}} ({{item.library.year}})</h3></span>
<span class="title">{{item.library.titles[0].title}} ({{item.library.year}})</span>
{% if item.library.rating %}<span class="rating text"><h3>Rating: {{item.library.rating}}</h3></span>{% endif %}
<span class="tagline text">{% if item.library.tagline %}{{item.library.tagline}}{% else %}{{item.library.plot|truncate(150)}}{% endif %}</span>
<span class="tagline">{% if item.library.tagline %}{{item.library.tagline}}{% else %}{{item.library.plot|truncate(150)}}{% endif %}</span>
{%if compact_view %}<span class="quality">{{item.profile.label}}</span>{%endif%}
</div>
<div class="options {{item.library.identifier}}" data-imdbid="{{item.library.identifier}}" data-cpid="{{item.library_id}}">
<img class="delete" src="{{ url_for('static', filename='images/no.png')}}"/>
Expand Down