Changeset 449


Ignore:
Timestamp:
03/09/14 17:20:55 (6 years ago)
Author:
jls17
Message:
  • little clean up in CDocImageOverview
  • fixed: image type was created incorrectly in createImageRowHtml function (imageList.js)
Location:
branches/work_304
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/doc/DocImageOverview.cpp

    r448 r449  
    2424CDocImageOverview::CDocImageOverview(void) 
    2525{ 
     26        pInside = CARInside::GetInstance(); 
     27        objCount = 0; 
    2628} 
    2729 
     
    3234unsigned int CDocImageOverview::Build() 
    3335{ 
    34         unsigned int objCount = 0; 
    3536#if AR_CURRENT_API_VERSION >= AR_API_VERSION_750 
    36         CARInside *pInside = CARInside::GetInstance(); 
    37  
    3837        // server version older than 7.5 ?? then there are no files to generate 
    3938        if (pInside->CompareServerVersion(7,5) < 0) return 0; 
     
    5150                { 
    5251                        CARImage img(idx); 
    53                         bool bInsert = false; 
    5452 
    5553#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764 
     
    6967 
    7068                CWebPage webPage(file->GetFileName(), "Image List", rootLevel, pInside->appConfig); 
    71  
    72                 webPage.GetReferenceManager() 
    73                         .AddScriptReference("img/object_list.js") 
    74                         .AddScriptReference("img/imageList.js") 
    75                         .AddScriptReference("img/jquery.timers.js") 
    76                         .AddScriptReference("img/jquery.address.min.js"); 
     69                SetupAdditionalPageResources(webPage); 
    7770 
    7871                stringstream strmTmp; 
    79                 strmTmp << "<span id='imageListFilterResultCount'></span>" << CWebUtil::LinkToImageIndex(objCount, rootLevel); 
     72                strmTmp << Header(); 
    8073                strmTmp << CDocMain::CreateImageFilterControl() << endl; 
    8174                strmTmp << letterFilter; 
     
    9285        return objCount; 
    9386} 
     87 
     88void CDocImageOverview::SetupAdditionalPageResources(CWebPage &webPage) 
     89{ 
     90        webPage.GetReferenceManager() 
     91                .AddScriptReference("img/object_list.js") 
     92                .AddScriptReference("img/imageList.js") 
     93                .AddScriptReference("img/jquery.timers.js") 
     94                .AddScriptReference("img/jquery.address.min.js"); 
     95} 
     96 
     97std::string CDocImageOverview::Header() 
     98{ 
     99        return "<span id='imageListFilterResultCount'></span>" + CWebUtil::LinkToImageIndex(objCount, rootLevel); 
     100} 
  • branches/work_304/doc/DocImageOverview.h

    r448 r449  
    1717#pragma once 
    1818 
     19class CARInside; 
     20namespace OUTPUT { class CWebPage; } 
     21 
    1922class CDocImageOverview 
    2023{ 
     
    2629 
    2730private: 
     31        CARInside *pInside; 
    2832        int rootLevel; 
     33        unsigned int objCount; 
     34 
     35        void SetupAdditionalPageResources(OUTPUT::CWebPage &webPage); 
     36        std::string Header(); 
    2937}; 
  • branches/work_304/res/imageList.js

    r446 r449  
    1616            .append($("<a>").attr("href", data[4]).text(data[0])) 
    1717        ) 
    18         .append($("<td>").text(AREnabled(data[1]))) 
     18        .append($("<td>").text(data[1])) 
    1919        .append($("<td>").text(data[2])) 
    2020                                .append($("<td>").text(data[3])) 
Note: See TracChangeset for help on using the changeset viewer.