Changeset 523 for branches


Ignore:
Timestamp:
04/10/14 17:06:56 (5 years ago)
Author:
jls17
Message:
  • replaced more inter-page-links with new URLLink class
Location:
branches/work_311
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInside.cpp

    r522 r523  
    11761176                if (group.Exists()) 
    11771177                { 
    1178                         return CWebUtil::Link(group.GetName(), CPageParams(PAGE_DETAILS, &group), "group.gif", rootLevel); 
     1178                        return URLLink(group, rootLevel); 
    11791179                }                
    11801180        } 
     
    11871187                        if(role.Exists()) 
    11881188                        { 
    1189                                 return CWebUtil::Link(role.GetName(), CPageParams(PAGE_DETAILS, &role), "doc.gif", rootLevel); 
     1189                                return URLLink(role, rootLevel); 
    11901190                        } 
    11911191                } 
  • branches/work_311/doc/DocAnalyzer.cpp

    r307 r523  
    1717#include "stdafx.h" 
    1818#include "DocAnalyzer.h" 
     19#include "../output/URLLink.h" 
    1920 
    2021CDocAnalyzer::CDocAnalyzer() 
     
    4849 
    4950                        CPageParams file(PAGE_ANALYZER_QBE_CHECK); 
    50                         webPage.AddContent(CWebUtil::Link("Form Index Analyzer", file, "doc.gif", rootLevel)); 
     51                        webPage.AddContent(URLLink("Form Index Analyzer", file, ImageTag::Document, rootLevel)); 
    5152                        IndexAnalyzer();                 
    5253 
  • branches/work_311/doc/DocFieldDetails.cpp

    r522 r523  
    5555                contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel, false) << endl; 
    5656                contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schemaType, rootLevel) << endl; 
    57                 contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &schema), CAREnum::SchemaTypeImage(schemaType), rootLevel) << endl; 
     57                contHeadStrm << MenuSeparator << URLLink(this->schema, rootLevel) << endl; 
    5858                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
    5959                        contHeadStrm << CAREnum::GetOverlayTypeString(schemaOverlayType); 
  • branches/work_311/doc/DocMain.cpp

    r522 r523  
    335335 
    336336                        strmTmp.str(""); 
    337                         strmTmp << CWebUtil::Link(CAREnum::ActiveLinkAction(nActionType), CPageParams(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_ACTIVE_LINK, nActionType), "doc.gif", rootLevel) << " (" << nCountIf << "/" << nCountElse << ")"; 
     337                        strmTmp << URLLink(CAREnum::ActiveLinkAction(nActionType), CPageParams(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_ACTIVE_LINK, nActionType), ImageTag::Document, rootLevel) << " (" << nCountIf << "/" << nCountElse << ")"; 
    338338 
    339339                        CTableRow row(""); 
     
    407407 
    408408                stringstream strmTmp; 
    409                 strmTmp << CWebUtil::Link("Active Links", CPageParams(PAGE_ACTION_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK), "active_link.gif", rootLevel) << " with " << CAREnum::ActiveLinkAction(nActionType) << " action"; 
     409                strmTmp << URLLink("Active Links", CPageParams(PAGE_ACTION_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK), ImageTag::ActiveLink, rootLevel) << " with " << CAREnum::ActiveLinkAction(nActionType) << " action"; 
    410410                tbl->SetDescription(strmTmp.str()); 
    411411 
     
    569569 
    570570                        strmTmp.str(""); 
    571                         strmTmp << CWebUtil::Link(CAREnum::FilterAction(nActionType), CPageParams(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_FILTER, nActionType), "doc.gif", rootLevel) << " (" << nCountIf << "/" << nCountElse << ")"; 
     571                        strmTmp << URLLink(CAREnum::FilterAction(nActionType), CPageParams(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_FILTER, nActionType), ImageTag::Document, rootLevel) << " (" << nCountIf << "/" << nCountElse << ")"; 
    572572 
    573573                        CTableRow row(""); 
     
    642642 
    643643                stringstream strmTmp; 
    644                 strmTmp << CWebUtil::Link("Filter", CPageParams(PAGE_ACTION_OVERVIEW, AR_STRUCT_ITEM_XML_FILTER), "filter.gif", rootLevel) << " with " << CAREnum::FilterAction(nActionType) << " action"; 
     644                strmTmp << URLLink("Filter", CPageParams(PAGE_ACTION_OVERVIEW, AR_STRUCT_ITEM_XML_FILTER), ImageTag::Filter, rootLevel) << " with " << CAREnum::FilterAction(nActionType) << " action"; 
    645645                tbl->SetDescription(strmTmp.str()); 
    646646 
     
    820820        try 
    821821        { 
    822                 int rootLevel = 1; 
     822                int rootLevel = file->GetRootLevel(); 
    823823                CWebPage webPage(file->GetFileName(), "Escalation Actions", rootLevel, this->pInside->appConfig); 
    824824 
     
    856856 
    857857                        strmTmp.str(""); 
    858                         strmTmp << CWebUtil::Link(CAREnum::FilterAction(nActionType), CPageParams(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_ESCALATION, nActionType), "doc.gif", 1) << " (" << nCountIf << "/" << nCountElse << ")"; 
     858                        strmTmp << URLLink(CAREnum::FilterAction(nActionType), CPageParams(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_ESCALATION, nActionType), ImageTag::Document, rootLevel) << " (" << nCountIf << "/" << nCountElse << ")"; 
    859859 
    860860                        CTableRow row(""); 
     
    930930 
    931931                stringstream strmTmp; 
    932                 strmTmp << CWebUtil::Link("Escalation", CPageParams(PAGE_ACTION_OVERVIEW, AR_STRUCT_ITEM_XML_ESCALATION), "escalation.gif", rootLevel) << " with " << CAREnum::FilterAction(nActionType) << " action"; 
     932                strmTmp << URLLink("Escalation", CPageParams(PAGE_ACTION_OVERVIEW, AR_STRUCT_ITEM_XML_ESCALATION), ImageTag::Escalation, rootLevel) << " with " << CAREnum::FilterAction(nActionType) << " action"; 
    933933                tbl->SetDescription(strmTmp.str()); 
    934934 
  • branches/work_311/doc/DocValidator.cpp

    r522 r523  
    9595                        webPage.AddContentHead(contHeadStrm.str()); 
    9696 
    97                         //cout << "Field reference validation" << endl; 
    98                         //webPage.AddContent(CWebUtil::Link("List of missing fields that are referenced in ARSystem workflow", CWebUtil::DocName("validation_field"), "doc.gif", rootLevel, true)); 
    99                         //this->FieldReferenceValidator(); 
    100  
    10197                        //Field reference check 
    10298                        webPage.AddContent("Missing Objects referenced by Workflow:<br/>"); 
  • branches/work_311/doc/DocVuiDetails.cpp

    r522 r523  
    4747                contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel, false) << endl; 
    4848                contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schemaType, this->rootLevel) << endl; 
    49                 contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &this->schema), CAREnum::SchemaTypeImage(schemaType), rootLevel); 
     49                contHeadStrm << MenuSeparator << URLLink(this->schema, rootLevel); 
    5050                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
    5151                        contHeadStrm << CAREnum::GetOverlayTypeString(schema.GetOverlayType()); 
  • branches/work_311/output/ImageTag.cpp

    r521 r523  
    3838                case ImageTag::NoImage: return ""; 
    3939                case ImageTag::Schema: return "schema.gif"; 
     40                case ImageTag::SchemaJoin: return "schema_join.gif"; 
     41                case ImageTag::SchemaView: return "schema_view.gif"; 
     42                case ImageTag::SchemaDialog: return "schema_dialog.gif"; 
     43                case ImageTag::SchemaVendor: return "schema_vendor.gif"; 
    4044                case ImageTag::Server: return "server.gif"; 
    4145                case ImageTag::Document: return "doc.gif"; 
     
    5660                case ImageTag::Visible: return "visible.gif"; 
    5761                case ImageTag::Edit: return "edit.gif"; 
     62                case ImageTag::Next: return "next.gif"; 
    5863                } 
    5964                // always throw an assert here, in case a undefined image is used! 
     
    6671        ImageDimensions FolderImageDimensions = { 16, 13 }; 
    6772        ImageDimensions PermissionDimensions =  { 18, 18 }; 
     73        ImageDimensions NextImageDimensions = { 10, 10 }; 
    6874 
    6975        // the following provides the image dimensions (width and height) 
     
    8086                case ImageTag::Visible: 
    8187                case ImageTag::Edit: return PermissionDimensions; 
     88                case ImageTag::Next: return NextImageDimensions; 
    8289                } 
    8390                return DefaultImageDimensions; 
     
    132139                        break; 
    133140                case AR_STRUCT_ITEM_XML_IMAGE: return ImageTag::Image; 
     141                case AR_STRUCT_ITEM_XML_USER: return ImageTag::User; 
     142                case AR_STRUCT_ITEM_XML_GROUP: return ImageTag::Group; 
     143                case AR_STRUCT_ITEM_XML_ROLE: return ImageTag::Document; 
    134144                default: return ImageTag::NoImage; 
    135145                } 
  • branches/work_311/output/ImageTag.h

    r520 r523  
    5151                        Visible, 
    5252                        Edit, 
     53                        Next, 
    5354                         
    5455                }; 
  • branches/work_311/output/WebPage.cpp

    r522 r523  
    8585        strm << "<table>" << endl; 
    8686        strm << "<tr>" << endl; 
    87         strm << "<td>" << CWebUtil::Link("Main", CPageParams(PAGE_MAINHOME), "server.gif", rootLevel) << "</td>" << endl; 
     87        strm << "<td>" << URLLink("Main", PAGE_MAINHOME, ImageTag::Server, rootLevel) << "</td>" << endl; 
    8888        strm << "<td>" << " (Server: " << URLLink(appConfig.serverName, PAGE_SERVER_INFO, rootLevel) << "</td>" << endl; 
    8989        strm << "<td>" << "@" << "</td>" << endl; 
     
    101101{ 
    102102        strm << "<table><tr>" << endl; 
    103         strm << "<td>" << CWebUtil::Link("Main", CPageParams(PAGE_MAINHOME), "next.gif", rootLevel)<< "</td>" << endl; 
     103        strm << "<td>" << URLLink("Main", PAGE_MAINHOME, ImageTag::Next, rootLevel)<< "</td>" << endl; 
    104104        strm << "<td>&nbsp;</td>" << endl; 
    105105        strm << "<td>" << CWebUtil::Link("Top", "#top", "up.gif", rootLevel)<< "</td>" << endl; 
Note: See TracChangeset for help on using the changeset viewer.