[Mrbs-commits] SF.net SVN: mrbs:[1692] mrbs/branches/ics_attachments

[cimorrison]

Revision: 1692
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1692&view=rev
Author:   cimorrison
Date:     2010-12-10 11:05:56 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
Merged in latest changes from the trunk

Modified Paths:
--------------
    mrbs/branches/ics_attachments/web/view_entry.php

Property Changed:
----------------
    mrbs/branches/ics_attachments/
    mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql


Property changes on: mrbs/branches/ics_attachments
___________________________________________________________________
Modified: svn:mergeinfo
   - /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1652-1688
   + /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1652-1691


Property changes on: mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1652-1688
   + /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1652-1691

Modified: mrbs/branches/ics_attachments/web/view_entry.php
===================================================================
--- mrbs/branches/ics_attachments/web/view_entry.php    2010-12-10 11:01:40 UTC 
(rev 1691)
+++ mrbs/branches/ics_attachments/web/view_entry.php    2010-12-10 11:05:56 UTC 
(rev 1692)
@@ -566,9 +566,9 @@
 
 <div id="view_entry_nav">
   <?php
-  // Only show the links for Edit/Copy/Delete if the room is enabled.    We're
-  // allowed to view existing bookings in disabled rooms, but not to modify or
-  // delete them.
+  // Only show the links for Edit and Delete if the room is enabled.    We're
+  // allowed to view and copy existing bookings in disabled rooms, but not to
+  // modify or delete them.
   if (!$room_disabled && !$area_disabled)
   {
     // Edit and Edit Series
@@ -587,22 +587,6 @@
     }
     echo "</div>\n";
     
-    // Copy and Copy Series
-    echo "<div>\n";
-    if (!$series)
-    {
-      echo "<a 
href=\"edit_entry.php?id=$id&amp;copy=1&amp;returl=$link_returl\">". 
get_vocab("copyentry") ."</a>";
-    }      
-    if (!empty($repeat_id) && !$series && $repeats_allowed)
-    {
-      echo " - ";
-    }     
-    if ((!empty($repeat_id) || $series) && $repeats_allowed) 
-    {
-      echo "<a 
href=\"edit_entry.php?id=$id&amp;edit_type=series&amp;day=$day&amp;month=$month&amp;year=$year&amp;copy=1&amp;returl=$link_returl\">".get_vocab("copyseries")."</a>";
-    }
-    echo "</div>\n";
-    
     // Delete and Delete Series
     echo "<div>\n";
     if (!$series)
@@ -619,6 +603,22 @@
     }
     echo "</div>\n";
   }
+  
+  // Copy and Copy Series
+  echo "<div>\n";
+  if (!$series)
+  {
+    echo "<a 
href=\"edit_entry.php?id=$id&amp;copy=1&amp;returl=$link_returl\">". 
get_vocab("copyentry") ."</a>";
+  }      
+  if (!empty($repeat_id) && !$series && $repeats_allowed)
+  {
+    echo " - ";
+  }     
+  if ((!empty($repeat_id) || $series) && $repeats_allowed) 
+  {
+    echo "<a 
href=\"edit_entry.php?id=$id&amp;edit_type=series&amp;day=$day&amp;month=$month&amp;year=$year&amp;copy=1&amp;returl=$link_returl\">".get_vocab("copyseries")."</a>";
+  }
+  echo "</div>\n";
   ?>
   <div>
     <?php


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits