Changeset 515 for branches


Ignore:
Timestamp:
04/09/14 16:46:30 (5 years ago)
Author:
jls17
Message:
  • replaced all calls to CWebUtil::ImageTag? for the "doc.gif" image with the direct use of ImageTag? class
Location:
branches/work_311
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInside.cpp

    r495 r515  
    4646#include "doc/DocCustomWorkflow.h" 
    4747 
     48#include "output/ImageTag.h" 
    4849#include "output/Table.h" 
    4950#include "output/WebUtil.h" 
     
    17831784 
    17841785                if (!noTableDescription) 
    1785                         tbl.description = CWebUtil::ImageTag("doc.gif", rootLevel) + "Change History"; 
     1786                { 
     1787                        tbl.description = ImageTag(ImageTag::Document, rootLevel); 
     1788                        tbl.description+= "Change History"; 
     1789                } 
    17861790 
    17871791                //Owner 
  • branches/work_311/core/ARProplistHelper.cpp

    r472 r515  
    1818#include "../ARInside.h" 
    1919#include "ARProplistHelper.h" 
     20#include "../output/ImageTag.h" 
    2021 
    2122CARProplistHelper::CARProplistHelper(const ARPropList* propList) 
     
    308309                } 
    309310 
    310                 tbl.description = CWebUtil::ImageTag("doc.gif", rootLevel) + "Object Properties"; 
     311                tbl.description = ImageTag(ImageTag::Document, rootLevel); 
     312                tbl.description+= "Object Properties"; 
    311313                strm << tbl; 
    312314 
  • branches/work_311/doc/DocAlActionStruct.cpp

    r489 r515  
    1919#include "DocAllMatchingIdsTable.h" 
    2020#include "DocActionOpenWindowHelper.h" 
     21#include "../output/ImageTag.h" 
    2122 
    2223CDocAlActionStruct::CDocAlActionStruct(CARInside &arIn, CARActiveLink &obj, string schemaName, int rootLevel) 
     
    174175                stringstream tblDesc; 
    175176                tblDesc.str(""); 
    176                 tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << IfElse(ifElse) << "-Actions"; 
     177                tblDesc << ImageTag(ImageTag::Document, rootLevel) << IfElse(ifElse) << "-Actions"; 
    177178                tblListAction.description = tblDesc.str(); 
    178179 
  • branches/work_311/doc/DocAlDetails.cpp

    r475 r515  
    1919#include "DocOverlayHelper.h" 
    2020#include "../output/IFileStructure.h" 
     21#include "../output/ImageTag.h" 
    2122 
    2223CDocAlDetails::CDocAlDetails(int alInsideId) 
     
    141142                        //Table description 
    142143                        stringstream tblDesc; 
    143                         tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Active Link Properties"; 
     144                        tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Active Link Properties"; 
    144145                        tblObjProp.description = tblDesc.str(); 
    145146 
  • branches/work_311/doc/DocEscalationDetails.cpp

    r475 r515  
    1818#include "DocEscalationDetails.h" 
    1919#include "DocOverlayHelper.h" 
     20#include "../output/ImageTag.h" 
    2021 
    2122CDocEscalationDetails::CDocEscalationDetails(unsigned int escalInsideId) 
     
    124125                        //Table description 
    125126                        stringstream tblDesc; 
    126                         tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Escalation Properties"; 
     127                        tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Escalation Properties"; 
    127128                        tblObjProp.description = tblDesc.str(); 
    128129 
  • branches/work_311/doc/DocFieldDetails.cpp

    r498 r515  
    2121#include "../core/ARGlobalField.h" 
    2222#include "../core/ARQualification.h" 
     23#include "../output/ImageTag.h" 
    2324#include "../output/WorkflowReferenceTable.h" 
    2425#include "../util/RefItem.h" 
     26 
     27using namespace OUTPUT; 
    2528 
    2629CDocFieldDetails::CDocFieldDetails(unsigned int SchemaInsideId, const CARField& fieldObj, int rootLevel) 
     
    232235 
    233236                stringstream tblDesc; 
    234                 tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow Reference:"; 
     237                tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Workflow Reference:"; 
    235238 
    236239                tblRef.description = tblDesc.str(); 
  • branches/work_311/doc/DocFilterActionStruct.cpp

    r490 r515  
    1818#include "DocFilterActionStruct.h" 
    1919#include "DocAllMatchingIdsTable.h" 
     20#include "../output/ImageTag.h" 
    2021 
    2122CDocFilterActionStruct::CDocFilterActionStruct(CARInside &arIn, CARServerObject &obj, string schemaName, int rootLevel, int structItemType) 
     
    150151                stringstream tblDesc; 
    151152                tblDesc.str(""); 
    152                 tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << IfElse(ifElse) << "-Actions"; 
     153                tblDesc << ImageTag(ImageTag::Document, rootLevel) << IfElse(ifElse) << "-Actions"; 
    153154                tblListAction.description = tblDesc.str(); 
    154155 
  • branches/work_311/doc/DocFilterDetails.cpp

    r495 r515  
    1818#include "DocFilterDetails.h" 
    1919#include "DocOverlayHelper.h" 
     20#include "../output/ImageTag.h" 
    2021#include "../output/WorkflowReferenceTable.h" 
    2122 
     
    118119                        //Table description 
    119120                        stringstream tblDesc; 
    120                         tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Filter Properties"; 
     121                        tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Filter Properties"; 
    121122                        tblObjProp.description = tblDesc.str(); 
    122123 
     
    264265                { 
    265266                        stringstream tblDesc; 
    266                         tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow Reference:"; 
     267                        tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Workflow Reference:"; 
    267268 
    268269                        tblRef.description = tblDesc.str(); 
  • branches/work_311/doc/DocMain.cpp

    r510 r515  
    1818#include "DocMain.h" 
    1919#include "../output/IFileStructure.h" 
     20#include "../output/ImageTag.h" 
    2021#include "../output/LetterFilterControl.h" 
    2122#include "../core/ARServerInfo.h" 
     
    7576 
    7677                stringstream tblDesc; 
    77                 tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Server informations"; 
     78                tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Server informations"; 
    7879                tbl.description = tblDesc.str(); 
    7980 
     
    13791380 
    13801381                stringstream strmTmp; 
    1381                 strmTmp << CWebUtil::ImageTag("doc.gif", rootLevel) << tbl.NumRows() << " Global Fields" << endl; 
     1382                strmTmp << ImageTag(ImageTag::Document, rootLevel) << tbl.NumRows() << " Global Fields" << endl; 
    13821383                tbl.description = strmTmp.str(); 
    13831384 
  • branches/work_311/doc/DocSchemaDetails.cpp

    r512 r515  
    1919#include "DocFieldDetails.h" 
    2020#include "../output/CsvPage.h" 
     21#include "../output/ImageTag.h" 
    2122#include "../output/TabControl.h" 
    2223#include "../output/WorkflowReferenceTable.h" 
     
    970971                } 
    971972 
    972                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Permissions" << "</h2>"; 
     973                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Permissions" << "</h2>"; 
    973974                strm << "<div id='schemaPermissions'>"  
    974975                         << "<h2>" << "Group Permissions" << "</h2>" << "<div>" << tbl << "</div>" 
     
    990991                //CPageParams file(PAGE_SCHEMA_INDEXES, &this->schema); 
    991992 
    992                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Indexes" << "</h2>"; 
     993                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Indexes" << "</h2>"; 
    993994                strm << "<div>"; 
    994995 
     
    10791080                } 
    10801081 
    1081                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Result List Fields" << "</h2>"; 
     1082                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Result List Fields" << "</h2>"; 
    10821083                strm << "<div>" << tbl << "</div>"; 
    10831084        } 
     
    11341135                } 
    11351136 
    1136                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Sort" << "</h2>"; 
     1137                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Sort" << "</h2>"; 
    11371138                strm << "<div>" << tbl << "</div>"; 
    11381139        } 
     
    20022003 
    20032004                // now write the table 
    2004                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Basic" << "</h2>"; 
     2005                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Basic" << "</h2>"; 
    20052006                strm << "<div>" << tbl << "</div>"; 
    20062007        } 
     
    20562057                 
    20572058                // now write the table 
    2058                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "EntryPoints" << "</h2>"; 
     2059                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "EntryPoints" << "</h2>"; 
    20592060                strm << "<div>" << tbl << "</div>"; 
    20602061        } 
     
    21402141                tbl.AddRow(row); 
    21412142 
    2142                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Audit Settings" << "</h2>"; 
     2143                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Audit Settings" << "</h2>"; 
    21432144                strm << "<div>" << tbl << "</div>"; 
    21442145        } 
     
    22402241                tbl.AddRow(row); 
    22412242 
    2242                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Archive Settings" << "</h2>"; 
     2243                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Archive Settings" << "</h2>"; 
    22432244                strm << "<div>" << tbl << "</div>"; 
    22442245        } 
     
    23712372                } 
    23722373 
    2373                 strm << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow reading data from this form" << endl; 
     2374                strm << ImageTag(ImageTag::Document, rootLevel) << "Workflow reading data from this form" << endl; 
    23742375                tabSet.ToXHtml(strm); 
    23752376 
    2376                 strm << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow writing data to this form" << endl; 
     2377                strm << ImageTag(ImageTag::Document, rootLevel) << "Workflow writing data to this form" << endl; 
    23772378                tabPush.ToXHtml(strm); 
    23782379 
    2379                 strm << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow deleting data on this form" << endl; 
     2380                strm << ImageTag(ImageTag::Document, rootLevel) << "Workflow deleting data on this form" << endl; 
    23802381                delAction.ToXHtml(strm); 
    23812382 
    2382                 strm << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow executing services on this form" << endl; 
     2383                strm << ImageTag(ImageTag::Document, rootLevel) << "Workflow executing services on this form" << endl; 
    23832384                tabService.ToXHtml(strm); 
    23842385        } 
     
    26852686                /////////////////////////////////////////////////////////////////////////////////////// 
    26862687 
    2687                 strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Full Text Search" << "</h2>"; 
     2688                strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Full Text Search" << "</h2>"; 
    26882689                strm << "<div>" << tbl << "</div>"; 
    26892690        } 
     
    26972698void CDocSchemaDetails::ShowChangeHistory(std::ostream &strm, CARProplistHelper *propIndex) 
    26982699{ 
    2699         strm << "<h2>" << CWebUtil::ImageTag("doc.gif", rootLevel) << "Change History &amp; Helptext" << "</h2>" 
     2700        strm << "<h2>" << ImageTag(ImageTag::Document, rootLevel) << "Change History &amp; Helptext" << "</h2>" 
    27002701             << "<div>" << this->pInside->ServerObjectHistory(&this->schema, rootLevel, true) << "</div>" << endl; 
    27012702} 
  • branches/work_311/output/Table.cpp

    r442 r515  
    232232} 
    233233 
    234 ostream& operator<<(ostream& strm, OUTPUT::CTable& tbl) 
     234ostream& OUTPUT::operator<<(ostream& strm, OUTPUT::CTable& tbl) 
    235235{  
    236236        tbl.ToXHtml(strm); 
  • branches/work_311/output/Table.h

    r442 r515  
    6464                void GetEmptyMessageRow(std::ostream& strm); 
    6565        }; 
     66 
     67        ostream& operator<<(ostream& strm, OUTPUT::CTable& tbl); 
    6668} 
    6769 
    68 ostream& operator<<(ostream& strm, OUTPUT::CTable& tbl); 
  • branches/work_311/output/UList.cpp

    r92 r515  
    1717#include "stdafx.h" 
    1818#include "UList.h" 
     19#include "ImageTag.h" 
    1920 
    2021using namespace OUTPUT; 
     
    5556 
    5657                if(bItemImage) 
    57                         liImage = CWebUtil::ImageTag("doc.gif", rootLevel); 
     58                        liImage = ImageTag(ImageTag::Document, rootLevel); 
    5859 
    5960                strm << "<li>" << liImage << listItem->itemText << "</li>" << endl; 
  • branches/work_311/output/WorkflowReferenceTable.cpp

    r495 r515  
    2121#include "../core/ARFilter.h" 
    2222#include "../core/ARImage.h" 
     23#include "../output/ImageTag.h" 
    2324#include "../ARInside.h" 
    24  
    2525 
    2626using namespace OUTPUT; 
     
    8282 
    8383                stringstream tblDesc; 
    84                 tblDesc << CWebUtil::ImageTag("doc.gif", rootLevel) << "Workflow Reference"; 
     84                tblDesc << ImageTag(ImageTag::Document, rootLevel) << "Workflow Reference"; 
    8585 
    8686                tblRef.description = tblDesc.str(); 
Note: See TracChangeset for help on using the changeset viewer.