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

Proposed by Renato Araujo Oliveira Filho on 2016-07-29
Status: Merged
Approved by: Alberto Mardegan on 2016-08-02
Approved revision: 169
Merged at revision: 163
Proposed branch: lp:~renatofilho/account-plugins/update-owncloud
Merge into: lp:account-plugins
Diff against target: 48 lines (+9/-5)
2 files modified
data/providers/owncloud.provider.in.in (+1/-1)
qml/owncloud/NewAccount.qml (+8/-4)
To merge this branch: bzr merge lp:~renatofilho/account-plugins/update-owncloud
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2016-07-29 Approve on 2016-08-02
Review via email: mp+301551@code.launchpad.net

Commit message

Update owncloud login screen.

Description of the change

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

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

To post a comment you must log in.
168. By Renato Araujo Oliveira Filho on 2016-08-01

Updated "placeholderText" for owncloud server url.

Alberto Mardegan (mardy) wrote :

Just a tiny fix, see the inline comment.

review: Needs Fixing
169. By Renato Araujo Oliveira Filho on 2016-08-02

Remove topMargin set property.

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

Alberto Mardegan (mardy) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<provider id="owncloud">2<provider id="owncloud">
3 <name>ownCloud</name>3 <name>ownCloud</name>
4 <icon>owncloud.png</icon>4 <icon>placeholder-app-icon</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
66
7 <template>7 <template>
88
=== 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 @@
77
8 signal finished8 signal finished
99
10 anchors.margins: units.gu(1)
11 height: contents.height10 height: contents.height
1211
13 property var __account: account12 property var __account: account
@@ -17,8 +16,13 @@
1716
18 Column {17 Column {
19 id: contents18 id: contents
20 anchors { left: parent.left; right: parent.right }19 anchors {
21 spacing: units.gu(1)20 top: parent.top
21 left: parent.left
22 right: parent.right
23 margins: units.gu(2)
24 }
25 spacing: units.gu(2)
2226
23 Label {27 Label {
24 id: errorLabel28 id: errorLabel
@@ -37,7 +41,7 @@
37 TextField {41 TextField {
38 id: urlField42 id: urlField
39 anchors { left: parent.left; right: parent.right }43 anchors { left: parent.left; right: parent.right }
40 placeholderText: i18n.dtr("account-plugins", "http://example.org")44 placeholderText: i18n.dtr("account-plugins", "http://myserver.com/owncloud")
41 focus: true45 focus: true
42 enabled: !__busy46 enabled: !__busy
4347

Subscribers

People subscribed via source and target branches