mirror of https://github.com/portainer/portainer
				
				
				
			feat(app): add type=button on every button with ngf-select (#4783)
							parent
							
								
									48dbb308ec
								
							
						
					
					
						commit
						0ac8a45825
					
				| 
						 | 
					@ -1,3 +1,3 @@
 | 
				
			||||||
<button ngf-select="$ctrl.onFileSelected($file)" class="btn ng-scope" button-spinner="$ctrl.state.uploadInProgress">
 | 
					<button type="button" ngf-select="$ctrl.onFileSelected($file)" class="btn ng-scope" button-spinner="$ctrl.state.uploadInProgress">
 | 
				
			||||||
  <i style="margin: 0;" class="fa fa-upload" ng-if="!$ctrl.state.uploadInProgress"></i>
 | 
					  <i style="margin: 0;" class="fa fa-upload" ng-if="!$ctrl.state.uploadInProgress"></i>
 | 
				
			||||||
</button>
 | 
					</button>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,7 @@
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="form-group">
 | 
					          <div class="form-group">
 | 
				
			||||||
            <div class="col-sm-12">
 | 
					            <div class="col-sm-12">
 | 
				
			||||||
              <button class="btn btn-sm btn-primary" ngf-select ngf-min-size="10" ngf-accept="'application/x-tar,application/x-gzip'" ng-model="formValues.UploadFile"
 | 
					              <button type="button" class="btn btn-sm btn-primary" ngf-select ngf-min-size="10" ngf-accept="'application/x-tar,application/x-gzip'" ng-model="formValues.UploadFile"
 | 
				
			||||||
                >Select file</button
 | 
					                >Select file</button
 | 
				
			||||||
              >
 | 
					              >
 | 
				
			||||||
              <span style="margin-left: 5px;">
 | 
					              <span style="margin-left: 5px;">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -205,7 +205,7 @@
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="form-group">
 | 
					    <div class="form-group">
 | 
				
			||||||
      <div class="col-sm-12">
 | 
					      <div class="col-sm-12">
 | 
				
			||||||
        <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.model.File">Select file</button>
 | 
					        <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.model.File">Select file</button>
 | 
				
			||||||
        <span style="margin-left: 5px;">
 | 
					        <span style="margin-left: 5px;">
 | 
				
			||||||
          {{ $ctrl.model.File.name }}
 | 
					          {{ $ctrl.model.File.name }}
 | 
				
			||||||
          <i class="fa fa-times red-icon" ng-if="!$ctrl.model.File" aria-hidden="true"></i>
 | 
					          <i class="fa fa-times red-icon" ng-if="!$ctrl.model.File" aria-hidden="true"></i>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -124,7 +124,7 @@
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="form-group">
 | 
					            <div class="form-group">
 | 
				
			||||||
              <div class="col-sm-12">
 | 
					              <div class="col-sm-12">
 | 
				
			||||||
                <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.StackFile">
 | 
					                <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.StackFile">
 | 
				
			||||||
                  Select file
 | 
					                  Select file
 | 
				
			||||||
                </button>
 | 
					                </button>
 | 
				
			||||||
                <span style="margin-left: 5px;">
 | 
					                <span style="margin-left: 5px;">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -78,7 +78,7 @@
 | 
				
			||||||
    <div class="form-group" ng-if="$ctrl.formData.TLSMode === 'tls_client_ca' || $ctrl.formData.TLSMode === 'tls_ca'">
 | 
					    <div class="form-group" ng-if="$ctrl.formData.TLSMode === 'tls_client_ca' || $ctrl.formData.TLSMode === 'tls_ca'">
 | 
				
			||||||
      <label class="col-sm-3 col-lg-2 control-label text-left">TLS CA certificate</label>
 | 
					      <label class="col-sm-3 col-lg-2 control-label text-left">TLS CA certificate</label>
 | 
				
			||||||
      <div class="col-sm-9 col-lg-10">
 | 
					      <div class="col-sm-9 col-lg-10">
 | 
				
			||||||
        <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSCACert">Select file</button>
 | 
					        <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSCACert">Select file</button>
 | 
				
			||||||
        <span style="margin-left: 5px;">
 | 
					        <span style="margin-left: 5px;">
 | 
				
			||||||
          {{ $ctrl.formData.TLSCACert.name }}
 | 
					          {{ $ctrl.formData.TLSCACert.name }}
 | 
				
			||||||
          <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSCACert && $ctrl.formData.TLSCACert === $ctrl.endpoint.TLSConfig.TLSCACert" aria-hidden="true"></i>
 | 
					          <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSCACert && $ctrl.formData.TLSCACert === $ctrl.endpoint.TLSConfig.TLSCACert" aria-hidden="true"></i>
 | 
				
			||||||
| 
						 | 
					@ -93,7 +93,7 @@
 | 
				
			||||||
      <div class="form-group">
 | 
					      <div class="form-group">
 | 
				
			||||||
        <label for="tls_cert" class="col-sm-3 col-lg-2 control-label text-left">TLS certificate</label>
 | 
					        <label for="tls_cert" class="col-sm-3 col-lg-2 control-label text-left">TLS certificate</label>
 | 
				
			||||||
        <div class="col-sm-9 col-lg-10">
 | 
					        <div class="col-sm-9 col-lg-10">
 | 
				
			||||||
          <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSCert">Select file</button>
 | 
					          <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSCert">Select file</button>
 | 
				
			||||||
          <span style="margin-left: 5px;">
 | 
					          <span style="margin-left: 5px;">
 | 
				
			||||||
            {{ $ctrl.formData.TLSCert.name }}
 | 
					            {{ $ctrl.formData.TLSCert.name }}
 | 
				
			||||||
            <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSCert && $ctrl.formData.TLSCert === $ctrl.endpoint.TLSConfig.TLSCert" aria-hidden="true"></i>
 | 
					            <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSCert && $ctrl.formData.TLSCert === $ctrl.endpoint.TLSConfig.TLSCert" aria-hidden="true"></i>
 | 
				
			||||||
| 
						 | 
					@ -106,7 +106,7 @@
 | 
				
			||||||
      <div class="form-group">
 | 
					      <div class="form-group">
 | 
				
			||||||
        <label class="col-sm-3 col-lg-2 control-label text-left">TLS key</label>
 | 
					        <label class="col-sm-3 col-lg-2 control-label text-left">TLS key</label>
 | 
				
			||||||
        <div class="col-sm-9 col-lg-10">
 | 
					        <div class="col-sm-9 col-lg-10">
 | 
				
			||||||
          <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSKey">Select file</button>
 | 
					          <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSKey">Select file</button>
 | 
				
			||||||
          <span style="margin-left: 5px;">
 | 
					          <span style="margin-left: 5px;">
 | 
				
			||||||
            {{ $ctrl.formData.TLSKey.name }}
 | 
					            {{ $ctrl.formData.TLSKey.name }}
 | 
				
			||||||
            <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSKey && $ctrl.formData.TLSKey === $ctrl.endpoint.TLSConfig.TLSKey" aria-hidden="true"></i>
 | 
					            <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSKey && $ctrl.formData.TLSKey === $ctrl.endpoint.TLSConfig.TLSKey" aria-hidden="true"></i>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -91,7 +91,7 @@
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="form-group">
 | 
					            <div class="form-group">
 | 
				
			||||||
              <div class="col-sm-12">
 | 
					              <div class="col-sm-12">
 | 
				
			||||||
                <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.File">
 | 
					                <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.File">
 | 
				
			||||||
                  Select file
 | 
					                  Select file
 | 
				
			||||||
                </button>
 | 
					                </button>
 | 
				
			||||||
                <span style="margin-left: 5px;">
 | 
					                <span style="margin-left: 5px;">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -212,7 +212,7 @@
 | 
				
			||||||
              <div class="form-group" ng-if="!formValues.LDAPSettings.TLSConfig.TLSSkipVerify">
 | 
					              <div class="form-group" ng-if="!formValues.LDAPSettings.TLSConfig.TLSSkipVerify">
 | 
				
			||||||
                <label class="col-sm-2 control-label text-left">TLS CA certificate</label>
 | 
					                <label class="col-sm-2 control-label text-left">TLS CA certificate</label>
 | 
				
			||||||
                <div class="col-sm-10">
 | 
					                <div class="col-sm-10">
 | 
				
			||||||
                  <button class="btn btn-sm btn-primary" ngf-select ng-model="formValues.TLSCACert">Select file</button>
 | 
					                  <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="formValues.TLSCACert">Select file</button>
 | 
				
			||||||
                  <span style="margin-left: 5px;">
 | 
					                  <span style="margin-left: 5px;">
 | 
				
			||||||
                    {{ formValues.TLSCACert.name }}
 | 
					                    {{ formValues.TLSCACert.name }}
 | 
				
			||||||
                    <i class="fa fa-check green-icon" ng-if="formValues.TLSCACert && formValues.TLSCACert === formValues.LDAPSettings.TLSConfig.TLSCACert" aria-hidden="true"></i>
 | 
					                    <i class="fa fa-check green-icon" ng-if="formValues.TLSCACert && formValues.TLSCACert === formValues.LDAPSettings.TLSConfig.TLSCACert" aria-hidden="true"></i>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -115,7 +115,7 @@
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="form-group">
 | 
					            <div class="form-group">
 | 
				
			||||||
              <div class="col-sm-12">
 | 
					              <div class="col-sm-12">
 | 
				
			||||||
                <button class="btn btn-sm btn-primary" ngf-select ng-model="formValues.StackFile">Select file</button>
 | 
					                <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="formValues.StackFile">Select file</button>
 | 
				
			||||||
                <span style="margin-left: 5px;">
 | 
					                <span style="margin-left: 5px;">
 | 
				
			||||||
                  {{ formValues.StackFile.name }}
 | 
					                  {{ formValues.StackFile.name }}
 | 
				
			||||||
                  <i class="fa fa-times red-icon" ng-if="!formValues.StackFile" aria-hidden="true"></i>
 | 
					                  <i class="fa fa-times red-icon" ng-if="!formValues.StackFile" aria-hidden="true"></i>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue