Changeset 541


Ignore:
Timestamp:
04/24/14 16:27:28 (5 years ago)
Author:
jls17
Message:
  • added visual difference between groups and roles
Location:
branches/work_311
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/CMakeLists.txt

    r500 r541  
    228228        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/res/packing_list.gif ${CMAKE_BINARY_DIR}/img 
    229229        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/res/prev.gif ${CMAKE_BINARY_DIR}/img 
     230        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/res/role.gif ${CMAKE_BINARY_DIR}/img 
    230231        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/res/schema.gif ${CMAKE_BINARY_DIR}/img 
    231232        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/res/schema_display.gif ${CMAKE_BINARY_DIR}/img 
  • branches/work_311/doc/DocRoleDetails.cpp

    r540 r541  
    194194                stringstream contHeadStrm; 
    195195                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    196                 contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
     196                contHeadStrm << MenuSeparator << URLLink(*pRole, rootLevel); 
    197197                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    198198                webPage.AddContentHead(contHeadStrm.str()); 
     
    295295                stringstream contHeadStrm; 
    296296                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    297                 contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
     297                contHeadStrm << MenuSeparator << URLLink(*pRole, rootLevel); 
    298298                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    299299                webPage.AddContentHead(contHeadStrm.str()); 
     
    351351                stringstream contHeadStrm; 
    352352                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    353                 contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
     353                contHeadStrm << MenuSeparator << URLLink(*pRole, rootLevel); 
    354354                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    355355                webPage.AddContentHead(contHeadStrm.str()); 
     
    473473                stringstream contHeadStrm; 
    474474                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    475                 contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
     475                contHeadStrm << MenuSeparator << URLLink(*pRole, rootLevel); 
    476476                contHeadStrm << MenuSeparator << CWebUtil::ObjName("Field Permissions") << endl; 
    477477                webPage.AddContentHead(contHeadStrm.str()); 
  • branches/work_311/output/ImageTag.cpp

    r533 r541  
    5757                case ImageTag::User: return "user.gif"; 
    5858                case ImageTag::Group: return "group.gif"; 
     59                case ImageTag::Role: return "role.gif"; 
    5960                case ImageTag::Hidden: return "hidden.gif"; 
    6061                case ImageTag::Visible: return "visible.gif"; 
     
    148149                case AR_STRUCT_ITEM_XML_USER: return ImageTag::User; 
    149150                case AR_STRUCT_ITEM_XML_GROUP: return ImageTag::Group; 
    150                 case AR_STRUCT_ITEM_XML_ROLE: return ImageTag::Document; 
     151                case AR_STRUCT_ITEM_XML_ROLE: return ImageTag::Role; 
    151152                default: return ImageTag::NoImage; 
    152153                } 
  • branches/work_311/output/ImageTag.h

    r532 r541  
    4848                        User, 
    4949                        Group, 
     50                        Role, 
    5051                        Hidden, 
    5152                        Visible, 
  • branches/work_311/output/NavigationPage.cpp

    r507 r541  
    8787                fout << "<li>" << URLLink("Webservices"       , CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_WEBSERVICE)  , ImageTag(ImageTag::Webservice, rootLevel)     , rootLevel, URLLink::TARGET_MODE_PARENT) << "</li>"; 
    8888                fout << "<li>" << URLLink("Groups"            , CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_GROUP)                        , ImageTag(ImageTag::Group, rootLevel)          , rootLevel, URLLink::TARGET_MODE_PARENT) << "</li>"; 
    89                 fout << "<li>" << URLLink("Roles"             , CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ROLE)                         , docImage          , rootLevel, URLLink::TARGET_MODE_PARENT) << "</li>"; 
     89                fout << "<li>" << URLLink("Roles"             , CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ROLE)                         , ImageTag(ImageTag::Role, rootLevel)           , rootLevel, URLLink::TARGET_MODE_PARENT) << "</li>"; 
    9090                fout << "<li>" << URLLink("Users"             , CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_USER)                         , ImageTag(ImageTag::User, rootLevel)           , rootLevel, URLLink::TARGET_MODE_PARENT) << "</li>"; 
    9191 
  • branches/work_311/output/WebUtil.cpp

    r540 r541  
    329329{ 
    330330        string name = (objectCount > 1?"Roles":"Role"); 
    331         return LinkToHelper(name, objectCount, CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ROLE), "doc.gif", rootLevel); 
     331        return LinkToHelper(name, objectCount, CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ROLE), "role.gif", rootLevel); 
    332332} 
    333333 
  • branches/work_311/res/arshelper.js

    r500 r541  
    142142                case 500: alt = "user.gif"; break; 
    143143                case 501: alt = "group.gif"; break; 
    144                 case 502: alt = "doc.gif"; width=15; height=10; break; 
     144                case 502: alt = "role.gif"; break; 
    145145        default: return ""; 
    146146    }; 
Note: See TracChangeset for help on using the changeset viewer.