diff --git a/application/modules/fouryearplans/views/scripts/edit/index.phtml b/application/modules/fouryearplans/views/scripts/edit/index.phtml index d22771a68647223d50cf591496f2fe6c7448bf24..3ca18ba6e90c839125fb23f58dc170d2b3a1593a 100644 --- a/application/modules/fouryearplans/views/scripts/edit/index.phtml +++ b/application/modules/fouryearplans/views/scripts/edit/index.phtml @@ -26,7 +26,12 @@ $stubConcentrations = array('stub' => '+'); <ul class="wdn_tabs"> <?php foreach ($this->fourYearPlan->getConcentrations() + $stubConcentrations as $concentrationId => $concentration) { ?> - <li><a href="#concentration-<?php echo $concentrationId; ?>"><?php echo $this->escape($concentration); ?></a></li> + <li> + <a href="#concentration-<?php echo $concentrationId; ?>"> + <span class="name"><?php echo $this->escape($concentration); ?></span> + <span class="minibutton remove">x</span> + </a> + </li> <?php } ?> </ul> <div class="wdn_tabs_content"> diff --git a/document_root/css/fouryearplans/edit.css b/document_root/css/fouryearplans/edit.css index 352a80fecc440b9034b651f32774edf3c270ffda..d5053c1316b6658e67cb173333299e4a636c2c65 100644 --- a/document_root/css/fouryearplans/edit.css +++ b/document_root/css/fouryearplans/edit.css @@ -1,2 +1,15 @@ .input-hours {width: 3em;} .semester td {white-space: nowrap;} +a[href="#concentration-stub"] span.minibutton {display: none;} +.minibutton.remove { + margin-right: -0.4em; + padding: 0 0.4em; + border: 1px solid transparent; + border-radius: 1em; + color: #888; +} +.minibutton.remove:hover { + border-color: #c44; + background-color: #fcc; + color: #c44; +} diff --git a/document_root/javascript/fouryearplans/edit.js b/document_root/javascript/fouryearplans/edit.js index 873cec37c40bcd1f34b4c05f0efc9adba4aa4b09..ac301fc975539ca7b073b2ad84836f08b732b5fa 100644 --- a/document_root/javascript/fouryearplans/edit.js +++ b/document_root/javascript/fouryearplans/edit.js @@ -102,6 +102,7 @@ WDN.jQuery(function() { var newTabIndex = 0; + WDN.tabs.useHashChange = false; WDN.jQuery('ul.wdn_tabs').on('tabchanged', function() { var selectedTab = WDN.jQuery(this).find('.selected'); if (selectedTab.find('a').attr('href') != '#concentration-stub') { @@ -114,7 +115,7 @@ WDN.jQuery(function() { selectedTab.before(newTab); newTab.find('a').attr('href', '#concentration-new' + newTabIndex); - newTab.find('a').text('New Concentration'); + newTab.find('a span.name').text('New Concentration'); var stubContent = WDN.jQuery('#concentration-stub'); var newContent = stubContent.clone(); @@ -138,9 +139,17 @@ WDN.jQuery(function() { newTab.find('a').trigger('click'); }, 50); }); + WDN.jQuery('ul.wdn_tabs').on('click', '.minibutton.remove', function() { + var tab = WDN.jQuery(this).parent().parent(); + var content = WDN.jQuery(tab.find('a').attr('href')); + + tab.remove(); + content.remove(); + return false; + }); WDN.jQuery('.wdn_tabs_content').on('keyup', '.concentration-name', function() { - WDN.jQuery('.wdn_tabs .selected a').text(this.value); + WDN.jQuery('.wdn_tabs .selected a span.name').text(this.value); }) WDN.jQuery('.semester').on('click', '.course-row .text-hours', function() {