[TASK] Adjust layout of openid settings in backend 25/38325/4
authorFrank Nägler <typo3@naegler.net>
Sat, 28 Mar 2015 17:48:35 +0000 (18:48 +0100)
committerJigal van Hemert <jigal.van.hemert@typo3.org>
Mon, 30 Mar 2015 10:37:52 +0000 (12:37 +0200)
The openid logo in user settings was to big and the popup
styling was adjusted.

Resolves: #66113
Releases: master
Change-Id: I6b09b3a36a518482629d9cb301026659d29fff00
Reviewed-on: http://review.typo3.org/38325
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
typo3/sysext/openid/Classes/OpenidModuleSetup.php
typo3/sysext/openid/Classes/Wizard.php
typo3/sysext/openid/Configuration/TCA/Overrides/be_users.php
typo3/sysext/openid/Resources/Private/Language/Wizard.xlf
typo3/sysext/openid/Resources/Private/Templates/Wizard/Content.html
typo3/sysext/openid/Resources/Public/StyleSheets/Wizard.css
typo3/sysext/openid/ext_icon_small.png [new file with mode: 0644]

index 12a9b69..6968bcc 100644 (file)
@@ -59,10 +59,10 @@ class OpenidModuleSetup {
                        '<div class="input-group-addon">' .
                                '<a href="#" onclick="' .
                                'vHWin=window.open(' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_openid') . '&P[itemName]=data%5Bbe_users%5D%5Btx_openid_openid%5D') .
-                               ',null,\'width=600,height=400,status=0,menubar=0,scrollbars=0\');' .
+                               ',null,\'width=800,height=400,status=0,menubar=0,scrollbars=0\');' .
                                'vHWin.focus();return false;' .
                                '">' .
-                                       '<img src="../typo3/sysext/openid/ext_icon.png" alt="' . $add . '" title="' . $add . '"/>' .
+                                       '<img src="../typo3/sysext/openid/ext_icon_small.png" alt="' . $add . '" title="' . $add . '"/>' .
                                '</a>' .
                        '</div>' .
                        '</div>';
index d1af979..780ae0a 100644 (file)
@@ -97,9 +97,7 @@ class Wizard extends OpenidService {
         * @return string Full URL with protocol and hostname
         */
        protected function getSelfUrl() {
-               return GeneralUtility::getIndpEnv('TYPO3_SITE_URL')
-                       . TYPO3_mainDir
-                       . BackendUtility::getModuleUrl('wizard_openid');
+               return BackendUtility::getModuleUrl('wizard_openid');
        }
 
        /**
index 4760a1e..1a6a9fb 100644 (file)
@@ -18,8 +18,8 @@ $tempColumns = array(
                                        'module' => array(
                                                'name' => 'wizard_openid'
                                        ),
-                                       'icon' => 'EXT:openid/ext_icon.png',
-                                       'JSopenParams' => ',width=600,height=400,status=0,menubar=0,scrollbars=0',
+                                       'icon' => 'EXT:openid/ext_icon_small.png',
+                                       'JSopenParams' => ',width=800,height=200,status=0,menubar=0,scrollbars=0',
                                )
                        ),
                )
index 8ffdded..e83e068 100644 (file)
@@ -38,6 +38,9 @@
                        <trans-unit id="html.openid_url" xml:space="preserve">
                                <source>OpenID identifier</source>
                        </trans-unit>
+                       <trans-unit id="html.search" xml:space="preserve">
+                               <source>Search</source>
+                       </trans-unit>
                        <trans-unit id="html.submit" xml:space="preserve">
                                <source>Login</source>
                        </trans-unit>
index 91aa48d..021ad2c 100644 (file)
        </f:if>
 
        <f:if condition="{showForm}">
+               <div class="form-inline form-inline-spaced">
                <form method="post" action="{formAction}">
                        <input type="hidden" name="P[itemName]" value="{parentFormItemName}"/>
                        <input type="hidden" name="P[fieldChangeFunc][TBE_EDITOR_fieldChanged]" value="{parentFormFieldChangeFunc}"/>
 
-                       <label for="openid_url"><f:translate key="LLL:EXT:openid/Resources/Private/Language/Wizard.xlf:html.openid_url" /></label>
-                       <input type="text" name="openid_url" id="openid_url" value="{openid_url}"/>
+                       <div class="form-group">
+                               <label for="openid_url"><f:translate key="LLL:EXT:openid/Resources/Private/Language/Wizard.xlf:html.openid_url" /></label>
+                               <input type="text" name="openid_url" class="form-control" id="openid_url" value="{openid_url}"/>
 
-                       <input class="btn btn-default" type="submit" value="{f:translate(key:'LLL:EXT:openid/Resources/Private/Language/Wizard.xlf:html.submit')}"/>
+                       </div>
+                       <button type="submit" class="btn btn-default" name="search" title="{f:translate(key:'LLL:EXT:openid/Resources/Private/Language/Wizard.xlf:html.search')">
+                               <i class="fa fa-openid"></i> {f:translate(key:'LLL:EXT:openid/Resources/Private/Language/Wizard.xlf:html.submit')}
+                       </button>
                </form>
+               </div>
        </f:if>
 </f:be.container>
index 010a619..6b62d48 100644 (file)
@@ -1,9 +1,7 @@
 body {
        padding: 5px;
 }
-#openid_url {
-       background-image: url('../../../ext_icon.png');
-       background-position: left 50%; /* LTR */
-       background-repeat: no-repeat;
-       padding-left: 20px;
+
+#ext-openid-wizard-index-php .btn {
+       margin-top: 6px;
 }
diff --git a/typo3/sysext/openid/ext_icon_small.png b/typo3/sysext/openid/ext_icon_small.png
new file mode 100644 (file)
index 0000000..3ca1ff4
Binary files /dev/null and b/typo3/sysext/openid/ext_icon_small.png differ