3 files changed, 38 insertions, 4 deletions

diff --git a/views/includes/card.html b/views/includes/card.html
index 289c9d3..a96cb49 100644
--- a/views/includes/card.html
+++ b/views/includes/card.html
@@ -3,6 +3,11 @@
 <div class="col s12 m6 l4">
         <div class="card white">
                 <div class="card-content black-text">
+                        {{ if $card.Image }}
+                        <div class="center-align" style="padding-top: 8px">
+                                <img class="circle responsive-img card-image" src="{{ $card.Image }}" />
+                        </div>
+                        {{ end }}
                         <span class="card-title">{{ $card.Title | html }}</span>
                         <p>{{ $card.Description | html }}</p>
                 </div>
@@ -11,7 +16,7 @@
                                 {{ if $action.Disabled }}
                                         <span>{{ $action.Name | html }}</span>
                                 {{ else }}
-                                        <a class="purple-text text-lighten-2" href="{{ $action.Link }}">{{ $action.Name | html }}</a>
+                                        <a {{ if $action.Target }} target="{{ $action.Target }}" {{ end }} class="purple-text text-lighten-2" href="{{ $action.Link }}">{{ $action.Name | html }}</a>
                                 {{ end }}
                         {{ end }}
                 </div>
diff --git a/views/includes/materialize_js.html b/views/includes/materialize_js.html
index be6dda6..e74202a 100644
--- a/views/includes/materialize_js.html
+++ b/views/includes/materialize_js.html
@@ -1,4 +1,4 @@
 {{ define "materialize_js" }}

 <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>

 <script src="/assets/js/materialize.min.js"></script>

-{{ end }}
\ No newline at end of file
+{{ end }}

diff --git a/views/pages/list.html b/views/pages/list.html
index 71f25fd..6d4d112 100644
--- a/views/pages/list.html
+++ b/views/pages/list.html
@@ -19,9 +19,19 @@
                                         <h1>{{ $list.Name }} <small>von <a href="/user/{{ $list.Owner.ID }}/{{ $list.Owner.GetName}}">{{ $list.Owner.GetName }}</a></small></h1>
                                 {{ if .isOwner }}</div>
                                 <div class="col s2 right-align">
-                                        <a class="waves-effect waves-light purple lighten-4 btn" style="margin-top: 8px; width: auto"href="/list/{{ $list.ID }}/settings">
-                                                                <i class="material-icons">settings</i> 
+                                        <a class="waves-effect waves-light purple lighten-4 btn" style="margin-top: 8px; width: auto" href="/list/{{ $list.ID }}/settings">
+                                                <i class="material-icons">settings</i> 
                                         </a>
+                                        {{ if $user.HasExternalServices }}
+                                        <a class="waves-effect waves-light green lighten-4 dropdown-button btn" data-constrainwidth="false" data-beloworigin="true" data-activates="import-dropdown" style="margin-top: 8px; width: auto">
+                                                <i class="material-icons">file_download</i> 
+                                        </a>
+                                        <ul id="import-dropdown" class="dropdown-content">
+                                                {{ if and $user.AnilistClient $user.AnilistClient.IsCoupled }}
+                                                <li><a id="import-from-anilist">Von Anilist importieren</a></li>
+                                                {{ end }}
+                                        </ul>
+                                        {{ end }}
                                 </div>
                         </div>{{ end }}
                         <blockquote>{{ $list.Description }}</blockquote><br />
@@ -62,6 +72,25 @@
                                 {{ end }}
                         </div>
                 </div>
+                <div id="gril-merge-modal" class="modal">
+                        <div class="modal-content">
+                                <h4>Gril zuordnen</h4>
+                                <p>Bitte Ordne deinem Anilist Favoriten ein Gril auf Grilist zu.</p>
+                                <div class="row center-align">
+                                        <img id="gril-merge-modal-image">
+                                </div>
+                                <h4 id="gril-merge-modal-name"></h4>
+                                <div id="gril-merge-modal-template">
+                                        {{ template "card" .mergeTemplateCard }}
+                                </div>
+                                <div id="gril-merge-modal-targets" class="row">
+                                </div>
+                        </div>
+                        <div class="modal-footer">
+                                <a class=" modal-action modal-close waves-effect waves-green btn-flat">Abbrechen</a>
+                        </div>
+                </div>
+                {{ template "materialize_js" }}
         </body>
 </html>
 {{ end }}