Merge pull request #19 from umbraco/feature/google-compliance

Feature/google compliance

Author: acoumb

azure-pipeline - SEO.GoogleSearchConsole.URLInspectionTool.yml

@@ -1,5 +1,5 @@
 trigger:
-- main
+- feature/google-compliance
 
 pool:
   vmImage: 'windows-latest'

src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/App_Plugins/UmbracoCms.Integrations/SEO/GoogleSearchConsole/URLInspectionTool/css/urlInspection.css

@@ -1 +1,8 @@
-.w25r { width: 25rem;}
+.w25r { width: 25rem;}
+
+.signin {
+    display: inline-block;
+    width: 52%;
+}
+
+.disabled { pointer-events: none; }

src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/App_Plugins/UmbracoCms.Integrations/SEO/GoogleSearchConsole/URLInspectionTool/images/btn_google_signin_dark_disabled_web.png

@@ -2,13 +2,10 @@
     <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
     <umb-box>
         <umb-box-header title-key="urlInspectionTool_title">
-            <umb-button action="vm.onConnectClick()"
-                        type="button"
-                        button-style="primary"
-                        state="init"
-                        label="Connect"
-                        disabled="vm.oauthConfiguration.isConnected">
-            </umb-button>
+            <a href="javascript:void(0)" class="signin" ng-click="vm.onConnectClick()" ng-class="{ 'disabled': vm.oauthConfiguration.isConnected }">
+                <img ng-if="vm.oauthConfiguration.isConnected" src="/App_Plugins/UmbracoCms.Integrations/SEO/GoogleSearchConsole/URLInspectionTool/images/btn_google_signin_dark_disabled_web.png" />
+                <img ng-if="!vm.oauthConfiguration.isConnected" src="/App_Plugins/UmbracoCms.Integrations/SEO/GoogleSearchConsole/URLInspectionTool/images/btn_google_signin_dark_normal_web.png" />
+            </a>
             <umb-button action="vm.onRevokeToken()"
                         type="button"
                         button-style="danger"
@@ -41,7 +38,7 @@ <h5>About Google Search Console - URL Inspection API</h5>
                     <div class="flex justify-start">
                         <div class="w25r">
                             <h5>Inspection URL</h5>
-                            <input type="text" class="w-100" ng-if="!vm.inspectionObj.multipleUrls" ng-model="vm.inspectionObj.inspectionUrl" 
+                            <input type="text" class="w-100" ng-if="!vm.inspectionObj.multipleUrls" ng-model="vm.inspectionObj.inspectionUrl"
                                    no-dirty-check ng-disabled="!vm.inspectionObj.enabled" />
                             <select ng-if="vm.inspectionObj.multipleUrls" ng-model="vm.inspectionObj.inspectionUrl" ng-change="vm.onChangeInspectionUrl()"
                                     no-dirty-check class="w-100">
@@ -50,7 +47,7 @@ <h5>Inspection URL</h5>
                         </div>
                         <div class="ml3 w25r">
                             <h5>Site URL</h5>
-                            <input type="text" class="w-100" ng-model="vm.inspectionObj.siteUrl" no-dirty-check ng-disabled="!vm.inspectionObj.enabled"/>
+                            <input type="text" class="w-100" ng-model="vm.inspectionObj.siteUrl" no-dirty-check ng-disabled="!vm.inspectionObj.enabled" />
                         </div>
                     </div>
                 </div>

src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/App_Plugins/UmbracoCms.Integrations/SEO/GoogleSearchConsole/URLInspectionTool/images/btn_google_signin_dark_normal_web.png

@@ -43,21 +43,6 @@
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup>
-	  <None Remove="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\js\url-inspection-tool.controller.js" />
-	  <None Remove="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\js\url-inspection-tool.resource.js" />
-	  <None Remove="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\lang\en-US.xml" />
-	  <None Remove="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\package.manifest" />
-	  <None Remove="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\urlInspection.css" />
-	  <None Remove="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\urlInspection.html" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <Content Update="App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\lang\en-US.xml">
-	    <PackagePath>App_Plugins\UmbracoCms.Integrations\SEO\GoogleSearchConsole\URLInspectionTool\</PackagePath>
-	  </Content>
-	</ItemGroup>
-
 	<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
 		<ItemGroup>
 			<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />