Fixed remaining merge conflicts before release.

mrtopher · Jan 31, 2012 · 7f78b4d · 7f78b4d
1 parent 4d75d94
commit 7f78b4d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 48 deletions.
diff --git a/themes/third_party/dashee/css/settings.css b/themes/third_party/dashee/css/settings.css
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-.pageContents caption a.dashHelp { 
-=======
 .pageContents caption a.dashLayoutHelp { 
->>>>>>> dev
 	display:block; 
 	float:right; 
 	padding-top:2px; 

diff --git a/themes/third_party/dashee/js/dashee.js b/themes/third_party/dashee/js/dashee.js
@@ -93,9 +93,6 @@ var dashEE = {
 					height:140,
 					modal: true,
 					buttons: {
-						'No': function() {
-							$(this).dialog("close");
-						},
 						'Yes': $.proxy(function() {
 							$.ajax({
 								type: 'GET',
@@ -116,7 +113,10 @@ var dashEE = {
 									$.ee_notice("ERROR: The widget you selected could not be removed.", {type: 'error', open: true});
 								}, this)
 							});
-						}, this)
+						}, this),
+						'No': function() {
+							$(this).dialog("close");
+						}
 					},
 					title: 'Remove Widget'
 				});

diff --git a/themes/third_party/dashee/js/dashee.min.js b/themes/third_party/dashee/js/dashee.min.js
diff --git a/third_party/dashee/language/english/lang.dashee.php b/third_party/dashee/language/english/lang.dashee.php
@@ -72,12 +72,8 @@
 						This allows you to create different dashboard layouts tailored for different member groups. <strong>Please note:</strong> the defaults 
 						set here will only affect new users who are visiting the module for the first time. If they have already logged in and viewed the dashEE 
 						module their existing configuration will remain the same.</p>',
-<<<<<<< HEAD
-
-=======
 	'help_lock'		=> '<p>Locking a member groups dashEE layout will prevent those users from making any changes to their dashboard. They will not see the 
 						standard Expand All, Collapse All, Widgets or Setting options. They will also not be able to move or modify widget settings.</p>',
->>>>>>> dev
 
 	// Widgets
 	'wgt_create_links_name' => 'EE Create Links',

diff --git a/third_party/dashee/views/settings.php b/third_party/dashee/views/settings.php
@@ -42,11 +42,7 @@
 
 if($is_admin):
 
-<<<<<<< HEAD
-	$this->table->set_caption(lang('capLayouts').' <a class="dashHelp" href="#">What\'s this?</a>');
-=======
 	$this->table->set_caption(lang('capLayouts').' <a class="dashLayoutHelp" href="#">What\'s this?</a>');
->>>>>>> dev
 
 	$this->table->set_heading(
 	   lang('thName'),
@@ -88,21 +84,12 @@
 	$this->table->set_heading(
 	   lang('thMemberGroup'),
 	   lang('thDescription'),
-<<<<<<< HEAD
-=======
 	   lang('thLocked'),
->>>>>>> dev
 	   lang('thLayout')
 	   );
 
 	foreach($member_groups as $group)
 	{
-<<<<<<< HEAD
-		$this->table->add_row(
-			$group->title,
-			$group->description ? $group->description : '--',
-			form_dropdown('group_layouts['.$group->id.']', $opts_layouts, array_key_exists($group->id, $group_layouts) ? $group_layouts[$group->id] : $default_id)
-=======
 		if(array_key_exists($group->id, $group_layouts))
 		{
 			$layout_id = $group_layouts[$group->id]['layout_id'];
@@ -119,42 +106,24 @@
 			$group->description ? $group->description : '--',
 			form_checkbox('group_locked['.$group->id.']','locked', $locked, ($group->id == 1 ? 'disabled="disabled"' : '')) . ' ' . lang('lblLock') . ' (<a href="#" class="dashLockHelp">?</a>)',
 			form_dropdown('group_layouts['.$group->id.']', $opts_layouts, $layout_id)
->>>>>>> dev
 			);
 	}
 
 	echo $this->table->generate();
 
 ?>
 
-<<<<<<< HEAD
-<!--<p><input type="checkbox" name="reset" value="yes" /> <?php echo lang('prefReset'); ?></p>-->
-
-=======
->>>>>>> dev
 <div class="tableFooter">
 	<?php echo form_submit(array('name' => 'submit', 'value' => lang('submit'), 'class' => 'submit')); ?> 
 </div>
 
 <?php echo form_close(); ?>
 
-<<<<<<< HEAD
-<div id="dashConfirmLoad" style="display:none;">
-	<p><?php echo lang('confLoadLayout'); ?></p>
-</div>
-
-<div id="dashConfirmDelete" style="display:none;">
-	<p><?php echo lang('confDeleteLayout'); ?></p>
-</div>
-
-<div class="dashLayoutHelp" style="display:none;"><?php echo lang('help_layouts'); ?></div>
-=======
 <div id="dashConfirmLoad" style="display:none;"><p><?php echo lang('confLoadLayout'); ?></p></div>
 <div id="dashConfirmDelete" style="display:none;"><p><?php echo lang('confDeleteLayout'); ?></p></div>
 <div id="dashConfirmReset" style="display:none;"><p><?php echo lang('confResetLayout'); ?></p></div>
 
 <div id="dashLayoutHelp" style="display:none;"><?php echo lang('help_layouts'); ?></div>
 <div id="dashLockHelp" style="display:none;"><?php echo lang('help_lock'); ?></div>
->>>>>>> dev
 
 <?php endif; ?>