Changeset 498 for branches


Ignore:
Timestamp:
03/31/14 17:48:42 (5 years ago)
Author:
jls17
Message:
  • changed the header of the fields and view page accordingly.
  • moved the decision-code to CAREnum
Location:
branches/work_311
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/core/AREnum.cpp

    r462 r498  
    13921392        case AR_SCHEMA_VENDOR: return "Vendor"; 
    13931393        default: return EnumDefault; 
     1394        } 
     1395} 
     1396 
     1397const char* CAREnum::SchemaTypeImage(int nType) 
     1398{        
     1399        switch (nType) 
     1400        { 
     1401        case AR_SCHEMA_JOIN: return "schema_join.gif"; 
     1402        case AR_SCHEMA_VIEW: return "schema_view.gif"; 
     1403        case AR_SCHEMA_DIALOG: return "schema_display.gif"; 
     1404        case AR_SCHEMA_VENDOR: return "schema_vendor.gif"; 
     1405        default:        return "schema.gif"; 
    13941406        } 
    13951407} 
  • branches/work_311/core/AREnum.h

    r406 r498  
    3131        static string ContainerRefType(int nType); 
    3232        static string SchemaType(int nType); 
     33        static const char* SchemaTypeImage(int nType); 
    3334        static const char* JoinType(int nType); 
    3435        static string ContainerType(int nType); 
  • branches/work_311/doc/DocFieldDetails.cpp

    r495 r498  
    4545                int overlayType = field.GetOverlayType(); 
    4646                int schemaOverlayType = this->schema.GetOverlayType(); 
     47                int schemaType = schema.GetCompound().schemaType; 
    4748 
    4849                //ContentHead informations 
    4950                stringstream contHeadStrm; 
    50                 contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel) << endl; 
    51                 contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(this->schema.GetCompound().schemaType, rootLevel) << endl; 
    52                 contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &schema), "", rootLevel) << endl; 
     51                contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel, false) << endl; 
     52                contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schemaType, rootLevel) << endl; 
     53                contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &schema), CAREnum::SchemaTypeImage(schemaType), rootLevel) << endl; 
    5354                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
    5455                        contHeadStrm << CAREnum::GetOverlayTypeString(schemaOverlayType); 
  • branches/work_311/doc/DocSchemaDetails.cpp

    r497 r498  
    6767                        contHeadStrm << CWebUtil::LinkToSchemaIndex(rootLevel, false) << endl; 
    6868                        contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(compSchema.schemaType, rootLevel) << endl; 
    69                         contHeadStrm << MenuSeparator << CWebUtil::SchemaImageTag(compSchema.schemaType, rootLevel) << CWebUtil::ObjName(this->schema.GetName()); 
     69                        contHeadStrm << MenuSeparator << CWebUtil::ImageTag(CAREnum::SchemaTypeImage(compSchema.schemaType), rootLevel) << CWebUtil::ObjName(this->schema.GetName()); 
    7070                        contHeadStrm << CAREnum::GetOverlayTypeString(overlayType); 
    7171 
  • branches/work_311/doc/DocVuiDetails.cpp

    r271 r498  
    4040                CDocOverlayHelper overlayHelper(vui, rootLevel); 
    4141 
     42                int schemaType = this->schema.GetCompound().schemaType; 
     43 
    4244                //ContentHead informations 
    4345                stringstream contHeadStrm; 
    44                 contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel) << endl; 
    45                 contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(this->schema.GetCompound().schemaType, this->rootLevel) << endl; 
    46                 contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &this->schema), "", rootLevel); 
     46                contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel, false) << endl; 
     47                contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schemaType, this->rootLevel) << endl; 
     48                contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &this->schema), CAREnum::SchemaTypeImage(schemaType), rootLevel); 
    4749                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
    4850                        contHeadStrm << CAREnum::GetOverlayTypeString(schema.GetOverlayType()); 
  • branches/work_311/output/WebUtil.cpp

    r497 r498  
    141141} 
    142142 
    143 string CWebUtil::SchemaImageTag(int schemaType, int rootLevel) 
    144 { 
    145         const char* image = "schema.gif"; 
    146          
    147         switch (schemaType) 
    148         { 
    149         case AR_SCHEMA_JOIN: image = "schema_join.gif"; break; 
    150         case AR_SCHEMA_VIEW: image = "schema_join.gif"; break; 
    151         case AR_SCHEMA_DIALOG: image = "schema_display.gif"; break; 
    152         case AR_SCHEMA_VENDOR: image = "schema_vendor.gif"; break; 
    153         } 
    154  
    155         return ImageTag(image, rootLevel); 
    156 } 
    157  
    158143string CWebUtil::ObjName(const string& objName) 
    159144{ 
  • branches/work_311/output/WebUtil.h

    r497 r498  
    5656                static string ObjName(const string& objName); 
    5757                static string ChkBoxInput(string nameAndValue, bool checked); 
    58                 static string SchemaImageTag(int schemyType, int rootLevel); 
    5958 
    6059                static string LinkToActiveLinkIndex(int rootLevel); 
Note: See TracChangeset for help on using the changeset viewer.