Merge lp:~renatofilho/account-plugins/update-owncloud into lp:account-plugins

[Renato Araujo Oliveira Filho]

Update owncloud login screen.

It is on silo: 79 if you want to test it.

https://requests.ci-train.ubuntu.com/#/ticket/1643

[lp:~renatofilho/account-plugins/update-owncloud]

168. By Renato Araujo Oliveira Filho on 2016-08-01

Updated "placeholderText" for owncloud server url.

[Alberto Mardegan (mardy)]

Just a tiny fix, see the inline comment.

review: Needs Fixing

[lp:~renatofilho/account-plugins/update-owncloud]

169. By Renato Araujo Oliveira Filho on 2016-08-02

Remove topMargin set property.

[Renato Araujo Oliveira Filho (renatofilho)]

> Just a tiny fix, see the inline comment.
Fixed at Rev. 169

[Alberto Mardegan (mardy)]

LGTM!

review: Approve

=== modified file 'data/providers/owncloud.provider.in.in'
--- data/providers/owncloud.provider.in.in	2016-04-18 12:06:17 +0000
+++ data/providers/owncloud.provider.in.in	2016-08-02 11:55:09 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <provider id="owncloud">
   <name>ownCloud</name>
-  <icon>owncloud.png</icon>
+  <icon>placeholder-app-icon</icon>
   <translations>account-plugins</translations>
 
   <template>

=== modified file 'qml/owncloud/NewAccount.qml'
--- qml/owncloud/NewAccount.qml	2016-04-20 10:00:41 +0000
+++ qml/owncloud/NewAccount.qml	2016-08-02 11:55:09 +0000
@@ -7,7 +7,6 @@
 
     signal finished
 
-    anchors.margins: units.gu(1)
     height: contents.height
 
     property var __account: account
@@ -17,8 +16,13 @@
 
     Column {
         id: contents
-        anchors { left: parent.left; right: parent.right }
-        spacing: units.gu(1)
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+        }
+        spacing: units.gu(2)
 
         Label {
             id: errorLabel
@@ -37,7 +41,7 @@
         TextField {
             id: urlField
             anchors { left: parent.left; right: parent.right }
-            placeholderText: i18n.dtr("account-plugins", "http://example.org")
+            placeholderText: i18n.dtr("account-plugins", "http://myserver.com/owncloud")
             focus: true
             enabled: !__busy