[otrs-cvs] FAQ/Kernel/Output/HTML/Standard FAQ.dtl, 1.8, 1.9 AgentFAQ.dtl, 1.14, 1.15

cvs-log at otrs.org cvs-log at otrs.org
Wed Mar 26 08:38:28 GMT 2008


Comments:
Update of /home/cvs/FAQ/Kernel/Output/HTML/Standard
In directory lancelot:/tmp/cvs-serv3319/Kernel/Output/HTML/Standard

Modified Files:
	FAQ.dtl AgentFAQ.dtl 
Log Message:
Added multi attachment support and added more descriptions/chcks to html input fields.

Author: martin

Index: FAQ.dtl
===================================================================
RCS file: /home/cvs/FAQ/Kernel/Output/HTML/Standard/FAQ.dtl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FAQ.dtl	19 Mar 2008 10:54:57 -0000	1.8
--- FAQ.dtl	26 Mar 2008 08:38:22 -0000	1.9
***************
*** 10,14 ****
  # --
  
- 
  <!-- dtl:block:View -->
  <table border="0" width="100%" cellspacing="0" cellpadding="3">
--- 10,13 ----
***************
*** 46,50 ****
                <tr>
                  <td class="contentkey" valign="top">$Text{"Attachment"}:</td>
!                 <td class="contentvalue"> <a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=Download&ItemID=$QData{"ItemID"}">$QData{"Filename"}</a></td>
                </tr>
  <!-- dtl:block:FAQItemViewAttachment -->
--- 45,58 ----
                <tr>
                  <td class="contentkey" valign="top">$Text{"Attachment"}:</td>
!                 <td class="contentvalue">
!                   <table cellspacing="0" cellpadding="0">
! <!-- dtl:block:FAQItemViewAttachmentRow -->
!                     <tr>
!                       <td><a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=Download&ItemID=$QData{"ItemID"}&FileID=$QData{"FileID"}">$QData{"Filename"}</a></td>
!                       <td align="right">&nbsp;&nbsp; $QData{"Filesize"}</td>
!                     </tr>
! <!-- dtl:block:FAQItemViewAttachmentRow -->
!                   </table>
!                 </td>
                </tr>
  <!-- dtl:block:FAQItemViewAttachment -->
***************
*** 449,454 ****
          <input type="hidden" name="QuickSearch" value="1">
          <input type="hidden" name="CategoryIDs" value="$Data{"CategoryID"}">
!         <input type="text" name="What" value="$QData{"What"}" size="30" maxlength="50"><input class="button" type="submit" value="$Text{"Search"}"><br>
!         <a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=Search">$Text{"DetailSearch"}</a>
        </form>
  <!-- dtl:block:ExplorerQuickSearch -->
--- 457,461 ----
          <input type="hidden" name="QuickSearch" value="1">
          <input type="hidden" name="CategoryIDs" value="$Data{"CategoryID"}">
!         <input type="text" name="What" value="$QData{"What"}" size="30" maxlength="50"><input class="button" type="submit" value="$Text{"Search"}">
        </form>
  <!-- dtl:block:ExplorerQuickSearch -->
***************
*** 456,460 ****
  
  <!-- dtl:block:ExplorerLatestCreate -->
!       <h3>$Text{"LatestCreatedItems"}</h3>
        <table>
  <!-- dtl:block:ExplorerLatestCreateFAQItemRow -->
--- 463,474 ----
  
  <!-- dtl:block:ExplorerLatestCreate -->
!       <table border="0" width="100%" cellspacing="0" cellpadding="2">
!         <tr>
!           <td><h3>$Text{"LatestCreatedItems"}</h3></td>
! <!-- dtl:block:ExplorerLatestCreateRss -->
!           <td valign="top" align="right"><a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=rss&Type=Created" title="$Text{"FAQ News (new created)"}"><img src="$Env{"Images"}/rss.png" border="0"></a></td>
! <!-- dtl:block:ExplorerLatestCreateRss -->
!         </tr>
!       </table>
        <table>
  <!-- dtl:block:ExplorerLatestCreateFAQItemRow -->
***************
*** 472,476 ****
  
  <!-- dtl:block:ExplorerLatestChange -->
!       <h3>$Text{"LatestChangedItems"}</h3>
        <table>
  <!-- dtl:block:ExplorerLatestChangeFAQItemRow -->
--- 486,497 ----
  
  <!-- dtl:block:ExplorerLatestChange -->
!       <table border="0" width="100%" cellspacing="0" cellpadding="2">
!         <tr>
!           <td><h3>$Text{"LatestChangedItems"}</h3></td>
! <!-- dtl:block:ExplorerLatestChangeRss -->
!           <td valign="top" align="right"><a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=rss&Type=Changed" title="$Text{"FAQ News (recently changed)"}"><img src="$Env{"Images"}/rss.png" border="0"></a></td>
! <!-- dtl:block:ExplorerLatestChangeRss -->
!         </tr>
!       </table>
        <table>
  <!-- dtl:block:ExplorerLatestChangeFAQItemRow -->

Author: martin

Index: AgentFAQ.dtl
===================================================================
RCS file: /home/cvs/FAQ/Kernel/Output/HTML/Standard/AgentFAQ.dtl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AgentFAQ.dtl	19 Mar 2008 10:54:57 -0000	1.14
--- AgentFAQ.dtl	26 Mar 2008 08:38:22 -0000	1.15
***************
*** 58,63 ****
  <!-- dtl:block:FAQItemViewAttachment -->
                <tr>
!                 <td class="contentkey">$Text{"Attachment"}:</td>
!                 <td class="contentvalue"> <a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=Download&ItemID=$QData{"ItemID"}">$QData{"Filename"}</a></td>
                </tr>
  <!-- dtl:block:FAQItemViewAttachment -->
--- 58,72 ----
  <!-- dtl:block:FAQItemViewAttachment -->
                <tr>
!                 <td class="contentkey" valign="top">$Text{"Attachment"}:</td>
!                 <td class="contentvalue">
!                   <table cellspacing="0" cellpadding="0">
! <!-- dtl:block:FAQItemViewAttachmentRow -->
!                     <tr>
!                       <td><a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=Download&ItemID=$QData{"ItemID"}&FileID=$QData{"FileID"}">$QData{"Filename"}</a></td>
!                       <td align="right">&nbsp;&nbsp; $QData{"Filesize"}</td>
!                     </tr>
! <!-- dtl:block:FAQItemViewAttachmentRow -->
!                   </table>
!                 </td>
                </tr>
  <!-- dtl:block:FAQItemViewAttachment -->
***************
*** 357,360 ****
--- 366,372 ----
        </tr>
  <!-- dtl:block:HistoryRow -->
+       <tr class="contentfooter">
+         <td colspan="3">&nbsp;</td>
+       </tr>
      </table>
      </td>
***************
*** 451,454 ****
--- 463,476 ----
      </tr>
    </table>
+ # check, min one category should be accessible
+ <script language="JavaScript" type="text/javascript">
+ <!--
+ 
+ if ( !document.compose.CategoryID.options[0] ) {
+     alert('$JSText{"No category accesable. To create an article you need have at lease access to min. one category. Please check your group/category permission under -category menu-!"}');
+ }
+ 
+ //-->
+ </script>
  <!-- dtl:block:Add -->
  
***************
*** 515,531 ****
                    </tr>
                    <tr>
                      <td class="contentkey">$Text{"Attachment"}:</td>
                      <td class="contentvalue">
!                         <input name="file_upload" type="file" size="30" class="fixed">&nbsp;<a name="attachment"></a>
!                         <br/>
!                         $Data{"Filename"}
! #                        <input class="button" type="submit" name="AttachmentDelete" value="$Text{"Delete"}" onclick="return submit_compose();">
                      </td>
                    </tr>
                    <tr>
-                     <td class="contentkey">$Text{"Language"}: </td>
-                     <td class="contentvalue"> $Data{"LanguageOption"} </td>
-                   </tr>
-                   <tr>
                      <td colspan="2"><hr></td>
                    </tr>
--- 537,567 ----
                    </tr>
                    <tr>
+                     <td class="contentkey">$Text{"Language"}: </td>
+                     <td class="contentvalue"> $Data{"LanguageOption"} </td>
+                   </tr>
+                   <tr>
                      <td class="contentkey">$Text{"Attachment"}:</td>
                      <td class="contentvalue">
!                       <table cellspacing="0" cellpadding="0" width="400">
! <!-- dtl:block:UpdateAttachment -->
!                         <tr>
!                           <td><a href="$Env{"Baselink"}Action=$Env{"Action"}&Subaction=Download&ItemID=$QData{"ItemID"}&FileID=$QData{"FileID"}">$QData{"Filename"}</a></td>
!                           <td>$QData{"Filesize"}</td>
!                           <td align="right">
!                             <input class="button" type="submit" name="AttachmentDelete$QData{"FileID"}" value="$Text{"Delete"}">
!                           </td>
!                         </tr>
! <!-- dtl:block:UpdateAttachment -->
!                         <tr>
!                           <td colspan="2"><input name="file_upload" type="file" size="40" class="fixed"></td>
!                           <td align="right">
!                             <input class="button" type="submit" name="AttachmentUpload" value="$Text{"Attach"}">
!                             <a name="attachment"></a>
!                           </td>
!                         </tr>
!                       </table>
                      </td>
                    </tr>
                    <tr>
                      <td colspan="2"><hr></td>
                    </tr>
***************
*** 653,656 ****
--- 689,695 ----
          </tr>
  <!-- dtl:block:SystemHistoryRow -->
+       <tr class="contentfooter">
+         <td colspan="5">&nbsp;</td>
+       </tr>
        </table>
      </td>
***************
*** 732,735 ****
--- 771,778 ----
          return false;
      }
+     else if ( document.compose.PermissionGroups.selectedIndex == -1 ) {
+         alert('$JSText{"A category need min. one permission group!"}');
+         return false;
+     }
      return true;
  }
***************
*** 781,785 ****
                      <table border="0" cellspacing="0" cellpadding="3">
                        <tr>
!                         <td class="contentkey">$Text{"Category"}: </td>
                          <td class="contentvalue"> <input type="text" name="Name" value="$QData{"Name"}" size="35" maxlength="50"></td>
                        </tr>
--- 824,828 ----
                      <table border="0" cellspacing="0" cellpadding="3">
                        <tr>
!                         <td width="25%" class="contentkey">$Text{"Category"}: </td>
                          <td class="contentvalue"> <input type="text" name="Name" value="$QData{"Name"}" size="35" maxlength="50"></td>
                        </tr>
***************
*** 789,793 ****
                        </tr>
                        <tr>
!                         <td class="contentkey">$Text{"Comment"}: </td>
                          <td class="contentvalue"> <input type="text" name="Comment" value="$QData{"Comment"}" size="50" maxlength="80"></td>
                        </tr>
--- 832,836 ----
                        </tr>
                        <tr>
!                         <td class="contentkey">$Text{"Comment"}:<br/><i class="small">($Text{"Will be shown as comment in Explore."})</i> </td>
                          <td class="contentvalue"> <input type="text" name="Comment" value="$QData{"Comment"}" size="50" maxlength="80"></td>
                        </tr>
***************
*** 797,801 ****
                        </tr>
                        <tr>
!                         <td class="contentkey">$Text{"Permission"}: </td>
                          <td class="contentkey">$Data{"GroupOption"}</td>
                        </tr>
--- 840,844 ----
                        </tr>
                        <tr>
!                         <td class="contentkey">$Text{"Permission"}:<br/><i class="small">($Text{"Agent Groups which can access this category."})</i></td>
                          <td class="contentkey">$Data{"GroupOption"}</td>
                        </tr>


More information about the cvs-log mailing list