[pLog-svn] r798 - plog/trunk/templates/admin

oscar at devel.plogworld.net oscar at devel.plogworld.net
Sun Jan 23 15:30:03 GMT 2005


Author: oscar
Date: 2005-01-23 15:30:02 +0000 (Sun, 23 Jan 2005)
New Revision: 798

Modified:
   plog/trunk/templates/admin/blogsettings.template
   plog/trunk/templates/admin/blogtemplates.template
   plog/trunk/templates/admin/blogusers.template
   plog/trunk/templates/admin/customfields.template
   plog/trunk/templates/admin/default.template
   plog/trunk/templates/admin/editcomments.template
   plog/trunk/templates/admin/editlinkcategories.template
   plog/trunk/templates/admin/editlinks.template
   plog/trunk/templates/admin/editposts.template
   plog/trunk/templates/admin/edittrackbacks.template
   plog/trunk/templates/admin/errormessage.template
   plog/trunk/templates/admin/globalsettings.template
   plog/trunk/templates/admin/newblogtemplate.template
   plog/trunk/templates/admin/newglobaltemplate.template
   plog/trunk/templates/admin/newlocale.template
   plog/trunk/templates/admin/poststats.template
   plog/trunk/templates/admin/resources.template
   plog/trunk/templates/admin/sendtrackbacks.template
   plog/trunk/templates/admin/siteblogs.template
   plog/trunk/templates/admin/sitelocales.template
   plog/trunk/templates/admin/sitetemplates.template
   plog/trunk/templates/admin/siteusers.template
   plog/trunk/templates/admin/statistics.template
   plog/trunk/templates/admin/successmessage.template
   plog/trunk/templates/admin/usersettings.template
Log:
removed some useless smarty code so that reporting feedback or error messages is now easier

Modified: plog/trunk/templates/admin/blogsettings.template
===================================================================
--- plog/trunk/templates/admin/blogsettings.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/blogsettings.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -4,13 +4,8 @@
  <form name="blogSettings" action="admin.php" method="post">
   <fieldset class="inputField">
     <legend>{$locale->tr("blogSettings")}</legend> 
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
-
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
     <div class="field">
       <label for="blogLink">{$locale->tr("blog_link")}</label>
       <span class="required"></span>

Modified: plog/trunk/templates/admin/blogtemplates.template
===================================================================
--- plog/trunk/templates/admin/blogtemplates.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/blogtemplates.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -3,14 +3,8 @@
 
  <form name="editTemplates" method="post" action="admin.php">
  <div id="list">
- 
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if} 
- 
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
   <table class="info">
    <thead>
     <tr>

Modified: plog/trunk/templates/admin/blogusers.template
===================================================================
--- plog/trunk/templates/admin/blogusers.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/blogusers.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -2,13 +2,8 @@
 {include file="$admintemplatepath/navigation.template" showOpt=showBlogUsers title=$locale->tr("showBlogUsers")}
         <form id="blogUsers" action="admin.php" method="post">
         <div id="list">
-
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}		
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
 		
             <table class="info">
                 <thead>

Modified: plog/trunk/templates/admin/customfields.template
===================================================================
--- plog/trunk/templates/admin/customfields.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/customfields.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -3,14 +3,9 @@
 
         <form id="customFields" action="admin.php" method="post">
         <div id="list">
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
 		
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
-		
             <table class="info">
                 <thead>
                     <tr>

Modified: plog/trunk/templates/admin/default.template
===================================================================
--- plog/trunk/templates/admin/default.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/default.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -3,12 +3,8 @@
 	   <form name="loginForm" method="post">
 		  <fieldset class="inputField">
 		   <h4>{$locale->tr("login")}</h4> 
-           {if $viewIsError}
             {include file="admin/errormessage.template" message=$viewErrorMessage}
-           {/if}
-           {if $viewIsSuccess}
             {include file="admin/successmessage.template" message=$viewSuccessMessage}
-           {/if}
 		   {if $viewIsError=="" && $viewIsSuccess==""}
 		     <div class="welcomeMessage">
 		   	   {$locale->tr("welcome_message")}

Modified: plog/trunk/templates/admin/editcomments.template
===================================================================
--- plog/trunk/templates/admin/editcomments.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/editcomments.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -32,12 +32,8 @@
 		
         <form id="postCommentsList" action="admin.php" method="post">
         <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}		
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
             <table class="info">
                 <thead>
                     <tr>					

Modified: plog/trunk/templates/admin/editlinkcategories.template
===================================================================
--- plog/trunk/templates/admin/editlinkcategories.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/editlinkcategories.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -3,14 +3,8 @@
 
  <form id="linkCategories" action="admin.php" method="post">
  <div id="list"> 
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
- 
- 
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
  <table class="info">
   <thead>
    <tr>

Modified: plog/trunk/templates/admin/editlinks.template
===================================================================
--- plog/trunk/templates/admin/editlinks.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/editlinks.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -28,12 +28,8 @@
 
 <form id="links" action="admin.php" method="post">
 <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if} 
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
 <table class="info">
  <thead>
   <tr>

Modified: plog/trunk/templates/admin/editposts.template
===================================================================
--- plog/trunk/templates/admin/editposts.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/editposts.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -69,12 +69,8 @@
 
         <form id="postsList" action="admin.php" method="post">
         <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}		
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
             <table class="info">
                 <thead>
                     <tr>

Modified: plog/trunk/templates/admin/edittrackbacks.template
===================================================================
--- plog/trunk/templates/admin/edittrackbacks.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/edittrackbacks.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -3,12 +3,8 @@
 {include file="$admintemplatepath/navigation.template" showOpt=editPosts title=$locale->tr("editTrackbacks")}			
         <form id="postTrackbacks" action="admin.php" method="post">
         <div id="list">
-		 {if $viewIsSuccess}
-		  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
-		 {/if}
-		 {if $viewIsError}
-		  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
-		 {/if}		
+		  {include file="$admintemplatepath/successmessage.template"}
+		  {include file="$admintemplatepath/errormessage.template"}
             <table class="info">
                 <thead>
                     <tr>

Modified: plog/trunk/templates/admin/errormessage.template
===================================================================
--- plog/trunk/templates/admin/errormessage.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/errormessage.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -1,4 +1,6 @@
+{if $viewIsError}
 <div id="FormError">
   <img src="imgs/icon_warning-16.png" alt="Info" class="InfoIcon" />
-  <p class="ErrorText">{$message}</p>
-</div>
\ No newline at end of file
+  <p class="ErrorText">{if $message==""}{$viewErrorMessage}{else}{$message}{/if}</p>
+</div>
+{/if}
\ No newline at end of file

Modified: plog/trunk/templates/admin/globalsettings.template
===================================================================
--- plog/trunk/templates/admin/globalsettings.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/globalsettings.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -1,13 +1,7 @@
 {include file="$admintemplatepath/header.template"}
 {include file="$admintemplatepath/navigation.template" showOpt=editSiteSettings title=$locale->tr("editSiteSettings")}
-
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if} 
-  
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
   <form name="updateGlobalSettings" action="admin.php" method="post">
    <fieldset class="inputField">
 	<legend>{$locale->tr("editSiteSettings")}</legend>

Modified: plog/trunk/templates/admin/newblogtemplate.template
===================================================================
--- plog/trunk/templates/admin/newblogtemplate.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/newblogtemplate.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -1,13 +1,7 @@
 {include file="admin/header.template"}
 {include file="admin/navigation.template" showOpt=newBlogTemplate title=$locale->tr("newBlogTemplate")}
-
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
-
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
 <p>
   {$locale->tr("template_available_only_for_this_blog")}
  </p>

Modified: plog/trunk/templates/admin/newglobaltemplate.template
===================================================================
--- plog/trunk/templates/admin/newglobaltemplate.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/newglobaltemplate.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -2,7 +2,7 @@
 {include file="admin/navigation.template" showOpt=newTemplate title=$locale->tr("newTemplate")}
 
  {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
+  {include file="$admintemplatepath/errormessage.template"}
  {/if}
 
  {if $uploads_enabled}

Modified: plog/trunk/templates/admin/newlocale.template
===================================================================
--- plog/trunk/templates/admin/newlocale.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/newlocale.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -2,7 +2,7 @@
 {include file="$admintemplatepath/navigation.template" showOpt=newLocale title=$locale->tr("newLocale")}
 
  {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
+  {include file="$admintemplatepath/errormessage.template"}
  {/if}
 
  <h3>{$locale->tr("upload_locale")}</h3>

Modified: plog/trunk/templates/admin/poststats.template
===================================================================
--- plog/trunk/templates/admin/poststats.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/poststats.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -3,13 +3,8 @@
 
         <form id="postStats" action="admin.php" method="post">
         <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}		
-		
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
             <table class="info">
                 <thead>
                     <tr>

Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/resources.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -31,12 +31,8 @@
 
 <form name="Resources" method="post">
 <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if} 
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
 <table class="info">
  <thead>
   <tr>

Modified: plog/trunk/templates/admin/sendtrackbacks.template
===================================================================
--- plog/trunk/templates/admin/sendtrackbacks.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/sendtrackbacks.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -1,11 +1,7 @@
 {include file="$admintemplatepath/header.template"}
 {include file="$admintemplatepath/navigation.template" showOpt=newPost title=$locale->tr("send_trackback_pings")}
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
 <form name="pingThese" method="post">
  <fieldset class="inputField">
   <label for="postLink">{$locale->tr("trackback_links")}</label>

Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/siteblogs.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -28,12 +28,8 @@
  
  <form id="editBlogs" method="post" action="admin.php">
   <div id="list"> 
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
    <table class="info">
     <thead>
      <tr>

Modified: plog/trunk/templates/admin/sitelocales.template
===================================================================
--- plog/trunk/templates/admin/sitelocales.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/sitelocales.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -2,12 +2,8 @@
 {include file="$admintemplatepath/navigation.template" showOpt=siteLocales title=$locale->tr("siteLocales")}
  <form id="editLocales" method="post" action="admin.php">
   <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
    <table class="info">
     <thead>
      <tr>

Modified: plog/trunk/templates/admin/sitetemplates.template
===================================================================
--- plog/trunk/templates/admin/sitetemplates.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/sitetemplates.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -2,12 +2,8 @@
 {include file="admin/navigation.template" showOpt=siteTemplates title=$locale->tr("siteTemplates")}
  <form id="siteTemplates" method="post" action="admin.php">
  <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if} 
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
   <table class="info">
    <thead>
     <tr>

Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/siteusers.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -28,13 +28,8 @@
  
         <form id="siteUsers" action="admin.php" method="post">
         <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}
-		
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
             <table class="info">
                 <thead>
                     <tr>

Modified: plog/trunk/templates/admin/statistics.template
===================================================================
--- plog/trunk/templates/admin/statistics.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/statistics.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -2,12 +2,8 @@
 {include file="$admintemplatepath/navigation.template" showOpt=Stats title=$locale->tr("Stats")}
         <form id="postStats" action="admin.php" method="post">
         <div id="list">
- {if $viewIsSuccess}
-  {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
- {/if}
- {if $viewIsError}
-  {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
- {/if}		
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"}
             <table class="info">
                 <thead>
                     <tr>

Modified: plog/trunk/templates/admin/successmessage.template
===================================================================
--- plog/trunk/templates/admin/successmessage.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/successmessage.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -1,4 +1,6 @@
+{if $viewIsSuccess}
 <div id="FormInfo">
   <img src="imgs/icon_info-16.png" alt="Info" class="InfoIcon" />
-  <p class="InfoText">{$message}</p>
-</div>
\ No newline at end of file
+  <p class="InfoText">{if $message==""}{$viewSuccessMessage}{else}{$message}{/if}</p>
+</div>
+{/if}
\ No newline at end of file

Modified: plog/trunk/templates/admin/usersettings.template
===================================================================
--- plog/trunk/templates/admin/usersettings.template	2005-01-23 14:51:59 UTC (rev 797)
+++ plog/trunk/templates/admin/usersettings.template	2005-01-23 15:30:02 UTC (rev 798)
@@ -4,13 +4,8 @@
   <form name="userSettings" action="admin.php" method="post">
     <fieldset class="inputField">
      <legend>{$locale->tr("userSettings")}</legend>
-     {if $viewIsSuccess}
-        {include file="$admintemplatepath/successmessage.template" message=$viewSuccessMessage}
-     {/if}
-     {if $viewIsError}
-        {include file="$admintemplatepath/errormessage.template" message=$viewErrorMessage}
-     {/if}
-
+        {include file="$admintemplatepath/successmessage.template"}
+        {include file="$admintemplatepath/errormessage.template"}
      <div style="float:left;width:76%;border-right:1px solid #DEDEDE";>
       <div class="field">
         <label for="userName">{$locale->tr("username")}</label>




More information about the pLog-svn mailing list