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
1=== modified file 'data/providers/owncloud.provider.in.in'
2--- data/providers/owncloud.provider.in.in 2016-04-18 12:06:17 +0000
3+++ data/providers/owncloud.provider.in.in 2016-08-02 11:55:09 +0000
4@@ -1,7 +1,7 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <provider id="owncloud">
7 <name>ownCloud</name>
8- <icon>owncloud.png</icon>
9+ <icon>placeholder-app-icon</icon>
10 <translations>account-plugins</translations>
11
12 <template>
13
14=== modified file 'qml/owncloud/NewAccount.qml'
15--- qml/owncloud/NewAccount.qml 2016-04-20 10:00:41 +0000
16+++ qml/owncloud/NewAccount.qml 2016-08-02 11:55:09 +0000
17@@ -7,7 +7,6 @@
18
19 signal finished
20
21- anchors.margins: units.gu(1)
22 height: contents.height
23
24 property var __account: account
25@@ -17,8 +16,13 @@
26
27 Column {
28 id: contents
29- anchors { left: parent.left; right: parent.right }
30- spacing: units.gu(1)
31+ anchors {
32+ top: parent.top
33+ left: parent.left
34+ right: parent.right
35+ margins: units.gu(2)
36+ }
37+ spacing: units.gu(2)
38
39 Label {
40 id: errorLabel
41@@ -37,7 +41,7 @@
42 TextField {
43 id: urlField
44 anchors { left: parent.left; right: parent.right }
45- placeholderText: i18n.dtr("account-plugins", "http://example.org")
46+ placeholderText: i18n.dtr("account-plugins", "http://myserver.com/owncloud")
47 focus: true
48 enabled: !__busy
49

Subscribers

People subscribed via source and target branches