- I think this completes the new naming conventions for _center.tpl f…

…iles. There may be a change to the group template names later.

- Renamed error_404.tpl to error_404_center.tpl
- Renamed submission_edit_center.tpl to edit_submission_center.tpl
- Renamed submit_errors.tpl to submit_errors_center.tpl
- Renamed submit_groups.tpl to submit_groups_center.tpl
- Renamed submit_step_1.tpl to submit_step_1_center.tpl
- Renamed submit_step_2.tpl to submit_step_2_center.tpl
- Renamed submit_step_3.tpl to submit_step_3_center.tpl
- Renamed user_edit.tpl to user_settings_center.tpl
- Renamed user_follow.tpl to user_follow_center.tpl
- Renamed user_history.tpl to user_history_center.tpl
- Renamed user_search.tpl to user_search_center.tpl

git-svn-id: https://pligg.svn.beanstalkapp.com/svnroot/trunk@886 68377534-e894-4f14-aad3-e92cf46e58fa

admin/admin_users.php

@@ -376,21 +376,9 @@
 			check_actions('admin_users_edit', $vars);
 
 			// show the template
-			$main_smarty->assign('tpl_center', '/admin/user_edit');
+			$main_smarty->assign('tpl_center', '/admin/user_settings_center');
 			$main_smarty->display($template_dir . '/admin/admin.tpl');
-		}		
-
-
-
-
-
-
-		//
-
-
-
-
-
+		}	
 
 		if (sanitize($_GET["mode"], 3) == "resetpass"){ // reset user password
 

editlink.php

@@ -272,7 +272,7 @@
 			// show the template
 			//$main_smarty->assign('storylen', utf8_strlen(str_replace("<br />", "\n", $link_content)));
 			$main_smarty->assign('tpl_extra_fields', $the_template . '/submit_extra_fields');
-			$main_smarty->assign('tpl_center', $the_template . '/submission_edit_center');
+			$main_smarty->assign('tpl_center', $the_template . '/edit_submission_center');
 			$main_smarty->display($the_template . '/pligg.tpl');
 		}
 	}
@@ -333,7 +333,7 @@ function link_errors($linkres)
 
 	if ($error)
 	{
-		$main_smarty->assign('tpl_center', $the_template . '/submit_errors');
+		$main_smarty->assign('tpl_center', $the_template . '/submit_errors_center');
 		$main_smarty->assign('link_id', $_GET['id']);
 
 		// pagename

error_404.php

@@ -19,7 +19,7 @@
 
 // show the template
 header( "HTTP/1.1 404 Not Found" );
-$main_smarty->assign('tpl_center', $the_template . '/error_404');
+$main_smarty->assign('tpl_center', $the_template . '/error_404_center');
 $main_smarty->display($the_template . '/pligg.tpl');
 exit;
 

index.php

@@ -45,7 +45,7 @@ function str_ends_with($haystack, $needle) {
 	if (!$thecat)
 	{
 		header("Location: $my_pligg_base/error_404.php");
-		//$main_smarty->assign('tpl_center', 'error_404');
+		//$main_smarty->assign('tpl_center', 'error_404_center');
 		//$main_smarty->display($the_template . '/pligg.tpl');		
 		die();
 	}

modules/akismet/story.php

@@ -23,7 +23,7 @@
 	$link = new Link;
 	$link->id=$requestID;
 	if($link->read() == false){
-		$main_smarty->assign('tpl_center', 'error_404');
+		$main_smarty->assign('tpl_center', 'error_404_center');
 		$main_smarty->display($the_template . '/pligg.tpl');		
 		die();
 	}
@@ -52,7 +52,7 @@
 		include(mnminclude.'redirector.php');
 		$x = new redirector($_SERVER['REQUEST_URI']);
 
-		$main_smarty->assign('tpl_center', 'error_404');
+		$main_smarty->assign('tpl_center', 'error_404_center');
 		$main_smarty->display($the_template . '/pligg.tpl');		
 		die();
 	}
@@ -139,7 +139,7 @@
 	include(mnminclude.'redirector.php');
 	$x = new redirector($_SERVER['REQUEST_URI']);
 
-	$main_smarty->assign('tpl_center', 'error_404');
+	$main_smarty->assign('tpl_center', 'error_404_center');
 	$main_smarty->display($the_template . '/pligg.tpl');		
 	die();
 }

modules/status/status.php

@@ -59,7 +59,7 @@
 	}
 	else 
 	{
-		$main_smarty->assign('tpl_center', 'error_404');
+		$main_smarty->assign('tpl_center', 'error_404_center');
 		$main_smarty->display($the_template . '/pligg.tpl');		
 		die();
 	}

new.php

@@ -24,7 +24,7 @@
 	{
 		header("Location: $my_pligg_base/error_404.php");
 //		header("Location: error_404.php");
-//		$main_smarty->assign('tpl_center', 'error_404');
+//		$main_smarty->assign('tpl_center', 'error_404_center');
 //		$main_smarty->display($the_template . '/pligg.tpl');		
 		die();
 	}

profile.php

@@ -259,7 +259,7 @@ function show_profile() {
 	}
 
 	// show the template
-	$main_smarty->assign('tpl_center', $the_template . '/user_edit');
+	$main_smarty->assign('tpl_center', $the_template . '/user_settings_center');
 	$main_smarty->display($the_template . '/pligg.tpl');	
 }
 

story.php

@@ -192,7 +192,7 @@
 	$x = new redirector($_SERVER['REQUEST_URI']);
 
 	header("Location: $my_pligg_base/error_404.php");
-//	$main_smarty->assign('tpl_center', 'error_404');
+//	$main_smarty->assign('tpl_center', 'error_404_center');
 //	$main_smarty->display($the_template . '/pligg.tpl');		
 	die();
 }

storyrss.php

@@ -35,7 +35,7 @@
 		$x = new redirector($_SERVER['REQUEST_URI']);
 
 		header("Location: $my_pligg_base/error_404.php");
-//		$main_smarty->assign('tpl_center', 'error_404');
+//		$main_smarty->assign('tpl_center', 'error_404_center');
 //		$main_smarty->display($the_template . '/pligg.tpl');		
 		die();
 	}
@@ -92,7 +92,7 @@
 
 	header("Location: $my_pligg_base/error_404.php");
 //	header("Location: error_404.php");
-//	$main_smarty->assign('tpl_center', 'error_404');
+//	$main_smarty->assign('tpl_center', 'error_404_center');
 //	$main_smarty->display($the_template . '/pligg.tpl');		
 	die();
 }

submit.php

@@ -77,7 +77,7 @@
 		define('pagename', 'submit'); 
 		$main_smarty->assign('pagename', pagename);
 		$main_smarty->assign('submit_error', 'badkey');
-		$main_smarty->assign('tpl_center', $the_template . '/submit_errors');
+		$main_smarty->assign('tpl_center', $the_template . '/submit_errors_center');
 		$main_smarty->display($the_template . '/pligg.tpl');
 		die();
 	    }
@@ -122,7 +122,7 @@ function do_submit0() {
 	define('pagename', 'submit'); 
 	$main_smarty->assign('pagename', pagename);
 
-	$main_smarty->assign('tpl_center', $the_template . '/submit_step_1');
+	$main_smarty->assign('tpl_center', $the_template . '/submit_step_1_center');
 	$vars = '';
 	check_actions('do_submit0', $vars);
 	$main_smarty->display($the_template . '/pligg.tpl');
@@ -209,7 +209,7 @@ function do_submit1() {
 
 	if(!$linkres->valid) {
 		$main_smarty->assign('submit_error', 'invalidurl');
-		$main_smarty->assign('tpl_center', $the_template . '/submit_errors');
+		$main_smarty->assign('tpl_center', $the_template . '/submit_errors_center');
 		$main_smarty->display($the_template . '/pligg.tpl');
 		return;
 	}
@@ -218,7 +218,7 @@ function do_submit1() {
 		if(!is_numeric($_GET['id']) && $linkres->duplicates($url) > 0) {
 			$main_smarty->assign('submit_search', getmyurl("search_url", htmlentities($url)));
 			$main_smarty->assign('submit_error', 'dupeurl');
-			$main_smarty->assign('tpl_center', $the_template . '/submit_errors');
+			$main_smarty->assign('tpl_center', $the_template . '/submit_errors_center');
 
 			define('pagename', 'submit'); 
 		     	$main_smarty->assign('pagename', pagename);
@@ -314,7 +314,7 @@ function do_submit1() {
 	}
 
 	$main_smarty->assign('tpl_extra_fields', $the_template . '/submit_extra_fields');
-	$main_smarty->assign('tpl_center', $the_template . '/submit_step_2');
+	$main_smarty->assign('tpl_center', $the_template . '/submit_step_2_center');
 
 	define('pagename', 'submit'); 
 	$main_smarty->assign('pagename', pagename);
@@ -491,7 +491,7 @@ function do_submit2() {
 	}
 
 	$main_smarty->assign('tpl_extra_fields', $the_template . '/submit_extra_fields');
-	$main_smarty->assign('tpl_center', $the_template . '/submit_step_3');
+	$main_smarty->assign('tpl_center', $the_template . '/submit_step_3_center');
 
 
 	$vars = '';	
@@ -623,7 +623,7 @@ function link_errors($linkres)
 
 	if($error == true){
 		$main_smarty->assign('link_id', $linkres->id);
-		$main_smarty->assign('tpl_center', $the_template . '/submit_errors');
+		$main_smarty->assign('tpl_center', $the_template . '/submit_errors_center');
 		$main_smarty->display($the_template . '/pligg.tpl');
 		die();
 	}
@@ -638,9 +638,9 @@ function link_catcha_errors($linkerror)
 
 	if($linkerror == 'captcha_error') { // if no category is selected
 		$main_smarty->assign('submit_error', 'register_captcha_error');
-		$main_smarty->assign('tpl_center', $the_template . '/submit_errors');
+		$main_smarty->assign('tpl_center', $the_template . '/submit_errors_center');
 		$main_smarty->display($the_template . '/pligg.tpl');
-#		$main_smarty->display($the_template . '/submit_errors.tpl');
+#		$main_smarty->display($the_template . '/submit_errors_center.tpl');
 		$error = true;
 	}
 	return $error;

submit_groups.php

@@ -158,6 +158,6 @@
 $main_smarty->assign('pagename', pagename);
 
 // show the template
-$main_smarty->assign('tpl_center', $the_template . '/submit_groups');
+$main_smarty->assign('tpl_center', $the_template . '/submit_groups_center');
 $main_smarty->display($the_template . '/pligg.tpl');
 ?>

templates/bootstrap/submission_edit_center.tpl → templates/bootstrap/edit_submission_center.tpl

@@ -1,7 +1,7 @@
 {************************************
 ********* Edit Submission **********
 *************************************}
-<!-- submission_edit_center.tpl -->
+<!-- edit_submission_center.tpl -->
 {literal}
 	<script type="text/javascript">
 	function SetState(obj_checkbox, obj_textarea) {
@@ -130,4 +130,4 @@
 	<br />
 	<input type="submit" value="{#PLIGG_Visual_Submit2_Continue#}" class="btn btn-primary" />
 </form>
-<!--/submission_edit_center.tpl -->
+<!--/edit_submission_center.tpl -->

templates/bootstrap/error_404.tpl → templates/bootstrap/error_404_center.tpl

@@ -1,10 +1,10 @@
 {************************************
-******** 404 Error Template *********
+************* 404 Error *************
 *************************************}
-<!-- error_404.tpl -->
+<!-- error_404_center.tpl -->
 <legend>{#PLIGG_Visual_404_Title#}</legend>
 <p>{#PLIGG_Visual_404_Description#}</p>
 <ul>
 	{#PLIGG_Visual_404_Options#}
 </ul>
-<!--/error_404.tpl -->
+<!--/error_404_center.tpl -->

templates/bootstrap/pligg.tpl

@@ -27,7 +27,7 @@
 		{literal}
 			<script type="text/javascript">
 		$(function()
-		{	
+		{
 			$(".title").keyup(function() 
 			{
 				var title=$(this).val();

templates/bootstrap/submit_errors.tpl → templates/bootstrap/submit_errors_center.tpl

@@ -1,7 +1,7 @@
 {************************************
-****** Submit Errors Template *******
+*********** Submit Errors ***********
 *************************************}
-<!-- submit_errors.tpl -->
+<!-- submit_errors_center.tpl -->
 <fieldset>
 	{************************************
 	******* Submit Step 2 Errors ********
@@ -124,4 +124,4 @@
 	{/if}
 	{checkActionsTpl location="tpl_pligg_submit_error_3"}
 </fieldset>
-<!--/submit_errors.tpl -->
+<!--/submit_errors_center.tpl -->

templates/bootstrap/submit_groups.tpl → templates/bootstrap/submit_groups_center.tpl

@@ -1,7 +1,7 @@
 {************************************
-****** Submit Groups Template *******
+******* Create New Group Page *******
 *************************************}
-<!-- submit_groups.tpl -->
+<!-- submit_groups_center.tpl -->
 {if $enable_group eq "true" && $group_allow eq 1}
 	<fieldset>
 		{if $error}
@@ -64,4 +64,4 @@
 {else}
 	{#PLIGG_Visual_Group_Disabled#}
 {/if}
-<!--/submit_groups.tpl -->
+<!--/submit_groups_center.tpl -->

templates/bootstrap/submit_step_1.tpl → templates/bootstrap/submit_step_1_center.tpl

@@ -1,7 +1,7 @@
 {************************************
 ****** Submit Step 1 Template *******
 *************************************}
-<!-- submit_step_1.tpl -->
+<!-- submit_step_1_center.tpl -->
 <legend>{#PLIGG_Visual_Submit1_Header#}</legend>
 <div class="submit">
 	<h3>{#PLIGG_Visual_Submit1_Instruct#}:</h3>
@@ -42,4 +42,4 @@
 		</div>
 	</form>
 </div>
-<!-- submit_step_1.tpl -->
+<!-- submit_step_1_center.tpl -->

templates/bootstrap/submit_step_2.tpl → templates/bootstrap/submit_step_2_center.tpl

@@ -1,7 +1,7 @@
 {************************************
 ****** Submit Step 2 Template *******
 *************************************}
-<!-- submit_step_2.tpl -->
+<!-- submit_step_2_center.tpl -->
 <div class="submit_page">
 	<legend>{#PLIGG_Visual_Submit2_Details#}</legend>
 	{checkActionsTpl location="tpl_pligg_submit_step2_start"}
@@ -225,8 +225,8 @@
 	</form>
 </div>
 {literal}
-<script type="text/javascript">
-	var dock0=new dockit("dockcontent", 0);
-</script>
+	<script type="text/javascript">
+		var dock0=new dockit("dockcontent", 0);
+	</script>
 {/literal}
-<!--/submit_step_2.tpl -->
+<!--/submit_step_2_center.tpl -->

templates/bootstrap/submit_step_3.tpl → templates/bootstrap/submit_step_3_center.tpl

@@ -1,7 +1,7 @@
 {************************************
-****** Submit Step 1 Template *******
+****** Submit Step 3 Template *******
 *************************************}
-<!-- submit_step_3.tpl -->
+<!-- submit_step_3_center.tpl -->
 <div class="submit_page">
 	<legend>{#PLIGG_Visual_Submit3_Header#}</legend>
 	<h2>{#PLIGG_Visual_Submit3_Details#}</h2><br />
@@ -75,4 +75,4 @@
 	</form>
 	{checkActionsTpl location="tpl_submit_step_3_end"}
 </div>
-<!--/submit_step_3.tpl -->
+<!--/submit_step_3_center.tpl -->

templates/bootstrap/template_details.php

@@ -1,8 +1,8 @@
 <?php
 	$template_info['name'] = 'Bootstrap'; // do not use the _ character. use - instead
 	$template_info['desc'] = 'Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. Details can be found at the website: http://twitter.github.com/bootstrap/';
-	$template_info['author'] = 'Yankidank';
+	$template_info['author'] = 'Eric (Yankidank) Heikkinen';
 	$template_info['support'] = 'http://forums.pligg.com/';
-	$template_info['version'] = '2.0.0a';
+	$template_info['version'] = '2.0.0';
 	$template_info['designed_for_pligg_version'] = '2.0.0';
 ?>