From 14bae4bc93347b16ee729e18fc547303d9f582b7 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Fri, 8 Jan 2016 18:14:30 +0000
Subject: [PATCH] relocated the style button in the code file view

---
 codepot/src/codepot/views/code_file.php  | 84 ++++++++++--------------
 codepot/src/codepot/views/file_home.php  |  1 -
 codepot/src/codepot/views/issue_home.php |  2 +-
 3 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php
index 90c42239..8fd471be 100644
--- a/codepot/src/codepot/views/code_file.php
+++ b/codepot/src/codepot/views/code_file.php
@@ -28,61 +28,56 @@ $destyle_anchor_text = '<i class="fa fa-times"></i> ' . $this->lang->line('Desty
 ?>
 
 <script type="text/javascript">
-$(function () {
-	<?php
-	if ($login['settings'] != NULL && $login['settings']->code_hide_metadata == 'Y')
-		print '$("#code_file_mainarea_result_info").hide();';
-	?>
-
-	//if ($("#code_file_mainarea_result_info").is(":visible"))
-	//	btn_label = "<?php print $this->lang->line('Hide metadata')?>";
-	//else
-	//	btn_label = "<?php print $this->lang->line('Show metadata')?>";
-
-	btn = $("#code_file_mainarea_metadata_button").button().click (function () {
-		if ($("#code_file_mainarea_result_info").is(":visible"))
-		{
-			$("#code_file_mainarea_result_info").hide("blind",{},200);
-			//$("#code_file_mainarea_metadata_button").button(
-			//	"option", "label", "<?php print $this->lang->line('Show metadata')?>");
-		}
-		else
-		{
-			$("#code_file_mainarea_result_info").show("blind",{},200);
-			//$("#code_file_mainarea_metadata_button").button(
-			//	"option", "label", "<?php print $this->lang->line('Hide metadata')?>");
-		}
-
-		return false; // prevent the default behavior
-	});
-
-	$("#code_file_mainarea_edit_button").button();
-
-	// for code rendering
-	$("#code_file_mainarea_result_raw").html ($("#code_file_mainarea_result_code").html())
-	prettyPrint ();
-});
-
 var showing_raw_code = false;
 
 function showRawCode()
 {
 	if (showing_raw_code)
 	{
-		
-		$("#code_file_style_anchor").html('<?php print $destyle_anchor_text; ?>');
+		$("#code_file_mainarea_style_button").button("option", "label", '<?php print $destyle_anchor_text; ?>');
 		$("#code_file_mainarea_result_code").removeClass("prettyprinted");
 		prettyPrint();
 	}
 	else
 	{
-		$("#code_file_style_anchor").html('<?php print $enstyle_anchor_text ?>');
+		$("#code_file_mainarea_style_button").button("option", "label", '<?php print $enstyle_anchor_text; ?>');
 		$("#code_file_mainarea_result_code").html($("#code_file_mainarea_result_raw").html());
 	}
 
 	showing_raw_code = !showing_raw_code;
 }
 
+$(function () {
+	<?php
+	if ($login['settings'] != NULL && $login['settings']->code_hide_metadata == 'Y')
+		print '$("#code_file_mainarea_result_info").hide();';
+	?>
+
+	btn = $("#code_file_mainarea_metadata_button").button().click (function () {
+		if ($("#code_file_mainarea_result_info").is(":visible"))
+		{
+			$("#code_file_mainarea_result_info").hide("blind",{},200);
+		}
+		else
+		{
+			$("#code_file_mainarea_result_info").show("blind",{},200);
+		}
+
+		return false; // prevent the default behavior
+	});
+
+	$("#code_file_mainarea_edit_button").button();
+	$("#code_file_mainarea_style_button").button({"label": '<?php print $destyle_anchor_text; ?>'}).click (function () {
+		showRawCode();
+		return false;
+	});
+
+	// for code rendering
+	$("#code_file_mainarea_result_raw").html ($("#code_file_mainarea_result_code").html())
+	prettyPrint ();
+});
+
+
 </script>
 
 <title><?php 
@@ -196,10 +191,11 @@ $this->load->view (
 			print ' ';
 			print anchor ("code/edit/{$project->id}/{$xpar}{$revreq}", $this->lang->line('Edit'), 'id="code_file_mainarea_edit_button"');
 		}
-	?>
 
-	<a id="code_file_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a>
+		print anchor ("#", $this->lang->line('Enstyle'), 'id="code_file_mainarea_style_button"');
+?>
 
+		<a id="code_file_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a>
 	</div>
 
 	<div style="clear: both;"></div>
@@ -244,14 +240,6 @@ $this->load->view (
 
 	print ' | ';
 	print anchor ("code/fetch/{$project->id}/${xpar}{$revreq}", $download_anchor_text);
-
-	print ' | ';
-	print anchor (
-		"code/file/{$project->id}/${xpar}{$revreq}",
-		$destyle_anchor_text,
-		array('id'      => 'code_file_style_anchor', 
-		      'onClick' => 'showRawCode(); return false;')
-	);
 ?>
 </div> <!-- code_file_mainarea_menu -->
 
diff --git a/codepot/src/codepot/views/file_home.php b/codepot/src/codepot/views/file_home.php
index 507ff262..d7d1cd21 100644
--- a/codepot/src/codepot/views/file_home.php
+++ b/codepot/src/codepot/views/file_home.php
@@ -270,7 +270,6 @@ $this->load->view (
 	?> 
 
 	<?php if (isset($login['id']) && $login['id'] != ''): ?>
-	| 
 	<a id="file_home_mainarea_new_button" href='#'><?php print $this->lang->line('New')?></a>
 	<?php endif; ?>
 	</div>
diff --git a/codepot/src/codepot/views/issue_home.php b/codepot/src/codepot/views/issue_home.php
index 9f0cefa1..fdc25e39 100644
--- a/codepot/src/codepot/views/issue_home.php
+++ b/codepot/src/codepot/views/issue_home.php
@@ -313,7 +313,7 @@ $this->load->view (
 	<div class="title"><?php print $this->lang->line('Issues')?></div>
 
 	<div class="actions">
-		<?php printf ($this->lang->line('ISSUE_MSG_TOTAL_NUM_ISSUES'), $total_num_issues); ?> | 
+		<?php printf ($this->lang->line('ISSUE_MSG_TOTAL_NUM_ISSUES'), $total_num_issues); ?>
 		<?php if (isset($login['id']) && $login['id'] != ''): ?>
 		<a id="issue_home_mainarea_new_button" href='#'><?php print $this->lang->line('New')?></a>
 		<?php endif; ?>