Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop unneeded code #9245

Merged
merged 1 commit into from
Jul 2, 2014
Merged

Conversation

MorrisJobke
Copy link
Contributor

ref #8934

Following diff adds the icon-confirm button, but this just works on Chromium, Firefox and IE9. The fix for IE10 and IE11 is to apply the same fix as for IE9, but there are no easy ways to detect (except JS magic) IE10 and IE11. IE8 is broken.

@jancborchardt we need to fix the button CSS and header CSS. It's quite unstable ...

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index ddd9d10..1efd551 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -94,17 +94,32 @@ thead {
    height: 14px;
    line-height: 16px;
    padding: 6px;
+   border-top-right-radius: 0;
+   border-bottom-right-radius: 0;
 }

 #save button {
    margin: 0 5px;
    height: 28px;
-   padding-bottom: 4px;
+   padding-bottom: 3px;
    line-height: 14px;
 }

+#save .save-form button {
+   margin-left: -3px;
+   padding-bottom: 8px;
+}
+
 #save .save-form [type="submit"] {
-   margin: 0 5px;
+   margin: 0 5px 0 -4px;
    height: 28px;
-   padding-bottom: 4px;
+   padding: 8px;
+   border-top-left-radius: 0;
+   border-bottom-left-radius: 0;
+   line-height: 10px;
+}
+
+/* this also should be applied to ie10 and ie11 but there is no CSS class for this */
+.ie9 #save .save-form [type="submit"] {
+   padding-bottom: 5px;
 }
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 65e620a..f8a15f5 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -20,7 +20,7 @@
                    <button><?php p($l->t('Add to your ownCloud')) ?></button>
                    <form class="save-form hidden" action="#">
                        <input type="text" id="remote_address" placeholder="<?php p($l->t('example.com/owncloud')) ?>"/>
-                       <input type="submit" value="<?php p($l->t('Save')) ?>"/>
+                       <input type="submit" value="" class="svg icon-confirm" />
                    </form>
                </span>
                <a href="<?php p($_['downloadURL']); ?>" id="download" class="button">

@jancborchardt
Copy link
Member

Code looks like good changes, didn’t test yet.

Btw, using an id called »save« seems stupid because way too generic. What about »#add-to-your-owncloud« or something descriptive like that?

@scrutinizer-notifier
Copy link

The inspection completed: 1 new issues

@ghost
Copy link

ghost commented Jun 26, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/5792/

@jancborchardt
Copy link
Member

cc @owncloud/designers for review.

@jancborchardt
Copy link
Member

@MorrisJobke wording change is good, but the confirm icon doesn’t seem to be there.

@MorrisJobke
Copy link
Contributor Author

@jancborchardt As I wrote in the comment: I can't get it work and added my changeset, which just works in firefox and chrome, but none of the IE versions.

@PVince81
Copy link
Contributor

PVince81 commented Jul 1, 2014

Is this PR already mergable ? It doesn't need to fix everything at once...

@jancborchardt
Copy link
Member

I would say yeah, it looks good. 👍

@MorrisJobke ah, got it. That’s strange – how is that different from the other icons? Maybe it needs to be inside a div class="button" instead of an input?

@MorrisJobke
Copy link
Contributor Author

@PVince81 Yes it is. I just added this as info.

@jancborchardt
Copy link
Member

So can we have a second review? This strikes off one issue from the server-server sharing ux review.

@karlitschek
Copy link
Contributor

👍 from me

MorrisJobke added a commit that referenced this pull request Jul 2, 2014
@MorrisJobke MorrisJobke merged commit d2f3ff5 into master Jul 2, 2014
@MorrisJobke MorrisJobke deleted the server2server-sharing-design-fixes branch July 2, 2014 13:34
@lock lock bot locked as resolved and limited conversation to collaborators Aug 21, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants