Updating images and stles
Updating images and styles after code merge conflicts
Change-Id: I96490926caa41d13e4d625ff67f6a463d7819d34
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
diff --git a/app/configuration/controllers/network-controller.html b/app/configuration/controllers/network-controller.html
index 8c4aea0..6276ad3 100644
--- a/app/configuration/controllers/network-controller.html
+++ b/app/configuration/controllers/network-controller.html
@@ -88,11 +88,9 @@
</div>
</fieldset>
<div class="network-config__submit-wrapper">
- <button class="btn-primary inline">Confirm settings</button>
+ <button class="btn-primary inline">Save settings</button>
<button class="btn-secondary inline">Cancel</button>
</div>
</section>
</form>
-</div>
-<!-- confirmation modal -->
-<div ng-include="" src="'configuration/controllers/network-modal-controller.html'"></div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/configuration/controllers/network-modal-controller.html b/app/configuration/controllers/network-modal-controller.html
deleted file mode 100644
index 0297f35..0000000
--- a/app/configuration/controllers/network-modal-controller.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': network_settings_confirm}">
- <div class="modal__network-settings" role="document">
- <div class="screen-reader-offscreen modal-description">Confirm network settings</div><!-- accessibility only; used for screen readers -->
- <div class="page-header ">
- <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 32 32"><path
- d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
- d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
- Confirm network settings
- </h1>
- </div>
- <div class="modal__content">
- <div class="row">
- <p class="content-label large-4 column">Network interface</p>
- <p class="inline courier-bold column large-6 end">eth0</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Hostname</p>
- <p class="inline courier-bold column large-6 end">Whitherspoon 45</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Domain name</p>
- <p class="inline courier-bold column large-6 end">ibm.com</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">IPV4 address</p>
- <p class="inline courier-bold column large-6 end">DHCP controlled</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Subnet mask</p>
- <p class="inline courier-bold column large-6 end">DHCP controlled</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Default Gateway</p>
- <p class="inline courier-bold column large-6 end">DHCP controlled</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Primary DNS server</p>
- <p class="inline courier-bold column large-6 end">8.8.8.8</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Secondary DNS server</p>
- <p class="inline courier-bold column large-6 end">8.8.1.1</p>
- </div>
- <div class="row">
- <p class="content-label large-4 column">Tertiary DNS server</p>
- <p class="inline courier-bold column large-6 end">128.12.143.19</p>
- </div>
- </div>
- <div class="modal__button-wrapper">
- <button class="inline btn-secondary" ng-click="network_settings_confirm=false;">Cancel</button>
- <button class="inline btn-primary" ng-click="">Save settings</button>
- </div>
- </div>
-</section>
-<div class="modal-overlay" tabindex="-1" ng-class="{'active': network_settings_confirm}"></div>
\ No newline at end of file
diff --git a/app/configuration/styles/network.scss b/app/configuration/styles/network.scss
index f214846..b4bd72d 100644
--- a/app/configuration/styles/network.scss
+++ b/app/configuration/styles/network.scss
@@ -43,8 +43,4 @@
margin: .5em;
}
}
-}
-
-.modal__network-settings .row {
- padding: .5em 0;
}
\ No newline at end of file