From 3faba5c2c4c1ea00feca3628bf0a560d5dca8ec9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Sat, 17 Nov 2012 13:43:21 +0100
Subject: [PATCH] show "Sync" box also on device-edit page

---
 mygpo/web/templates/device-edit.html | 41 ++++++++++++++++++++++++++++++++----
 mygpo/web/templates/device.html      |  9 ++++----
 mygpo/web/views/device.py            | 10 +++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/mygpo/web/templates/device-edit.html b/mygpo/web/templates/device-edit.html
index 46d1c1c9..46b4375d 100644
--- a/mygpo/web/templates/device-edit.html
+++ b/mygpo/web/templates/device-edit.html
@@ -24,9 +24,8 @@
 
   {% if not device.deleted %}
 
-  <h2>{% trans "Edit" %}</h2>
   <div class="well">
-
+   <h2>{% trans "Edit" %}</h2>
    <form class="form-horizontal" action="{% url "device-update" device.uid %}" method="POST">
 
     {{ device_form.non_field_errors }}
@@ -66,8 +65,8 @@
   </form>
  </div>
 
+  <div class="well">
    <h2>{% trans "Replace Subscriptions" %}</h2>
-   <div class="well">
    <form class="form-inline" method="post" action="{% url "device-upload-opml" device.uid %}" enctype="multipart/form-data">
     <p>{% trans "Replace your current subscriptions by uploading an OPML file." %}</p>
     {% csrf_token %}
@@ -78,8 +77,8 @@
    </form>
   </div>
 
+ <div class="well">
   <h2>{% trans "Delete" %}</h2>
-  <div class="well">
   <form action="{% url "device-delete" device.uid %}" method="POST">
    {% csrf_token %}
    <button class="btn btn-danger" type="submit">
@@ -91,3 +90,37 @@
 
 {% endblock %}
 
+
+{% block sidebar %}
+
+ {% if not device.deleted %}
+
+  <div class="well">
+
+  <h4>{% trans "Synchronize" %}</h4>
+  <p>{% blocktrans %}If you synchronize devices, they will always have the same subscriptions. A podcast that is subscribed on one device, will automatically be added to all synchronized devices.{% endblocktrans %}</p>
+
+  {% if synced_with|length_is:"0" %}
+
+   <p>{% blocktrans with device.name|striptags as devicename %}{{ devicename }} is currently not synchronized with other devices.{% endblocktrans %}</p>
+
+  {% else %}
+
+   <p>{% blocktrans with device.name|striptags as devicename and synced_with|device_list as synclist %}{{ devicename }} is currently synchronized with {{ synclist }}.{% endblocktrans %}</p>
+   <a href="{% url "device-unsync" device.uid %}">{% blocktrans with device.name|striptags as devicename %}Stop synchronisation for {{ devicename }} {% endblocktrans %}</a>
+
+  {% endif %}
+
+  {% if has_sync_targets %}
+   <form action="{% url "device-sync" device.uid %}" method="POST">
+    {% csrf_token %}
+    {{ sync_form.as_p }}
+    <button class="btn" type="submit">{% trans "Synchronize" %}</button>
+   </form>
+  {% endif %}
+
+  </div>
+ {% endif %}
+
+{% endblock %}
+
diff --git a/mygpo/web/templates/device.html b/mygpo/web/templates/device.html
index ce4710bc..d6b7df26 100644
--- a/mygpo/web/templates/device.html
+++ b/mygpo/web/templates/device.html
@@ -78,9 +78,9 @@
 
 {% block sidebar %}
 
- <div class="well">
+ {% if not device.deleted %}
 
-  {% if not device.deleted %}
+  <div class="well">
 
   <h4>{% trans "Synchronize" %}</h4>
   <p>{% blocktrans %}If you synchronize devices, they will always have the same subscriptions. A podcast that is subscribed on one device, will automatically be added to all synchronized devices.{% endblocktrans %}</p>
@@ -104,9 +104,8 @@
    </form>
   {% endif %}
 
-  {% endif %}
-
- </div>
+  </div>
+ {% endif %}
 
 {% endblock %}
 
diff --git a/mygpo/web/views/device.py b/mygpo/web/views/device.py
index 758c52ea..9f102bd5 100644
--- a/mygpo/web/views/device.py
+++ b/mygpo/web/views/device.py
@@ -201,9 +201,19 @@ def edit(request, device):
         'uid' : device.uid
         })
 
+    synced_with = request.user.get_synced(device)
+
+    sync_targets = list(request.user.get_sync_targets(device))
+    sync_form = SyncForm()
+    sync_form.set_targets(sync_targets,
+            _('Synchronize with the following devices'))
+
     return render(request, 'device-edit.html', {
         'device': device,
         'device_form': device_form,
+        'sync_form': sync_form,
+        'synced_with': synced_with,
+        'has_sync_targets': len(sync_targets) > 0,
     })
 
 
-- 
2.11.4.GIT