Changeset 1507 for trunk/gsdl/src/recpt/collectoraction.cpp
- Timestamp:
- 2000-09-06T14:14:46+12:00 (24 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/collectoraction.cpp
r1485 r1507 350 350 } 351 351 352 if (current_page == "bildstatus" ) {352 if (current_page == "bildstatus" || current_page == "bildcancel") { 353 353 // if .final file exists then build has finished 354 354 text_t fbld = filename_cat (gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld.final"); … … 589 589 if (enabled) { 590 590 text_t gsmacro = "_gsimage_"; 591 if (thispage == "info" || thispage == "srce" || thispage == "conf") { 591 if (thispage == "info" || thispage == "srce" || thispage == "conf" || 592 thispage == "bildcancel" || thispage == "bildfail") { 592 593 gsmacro = "_gsjimage_"; 593 594 } else if (type == "view") { … … 683 684 fullnamemenu.push_back ('>'); 684 685 fullnamemenu += fullnames[i]; 685 if (write_protected[i]) fullnamemenu += " <b>(write protected)</b>";686 686 fullnamemenu.push_back ('\n'); 687 687 … … 805 805 806 806 if (collector_page == "new") { 807 collectorbar += "<td>_icongreyarrow_</td>\n"; 807 808 collectorbar += get_button (collector_page, "green", "info", true); 808 809 collectorbar += "<td>_icongreyarrow_</td>\n"; … … 816 817 817 818 } else if (collector_page == "info") { 819 collectorbar += "<td>_icongreyarrow_</td>\n"; 818 820 collectorbar += get_button (collector_page, "yellow", "info", false); 819 821 collectorbar += "<td>_icongreyarrow_</td>\n"; … … 825 827 collectorbar += "<td>_icongreyarrow_</td>\n"; 826 828 collectorbar += get_button (collector_page, "grey", "view", false); 827 collectorbar += "</tr><tr><td align=center>_icongreyuparrow_</td><td colspan=8></td>\n";829 collectorbar += "</tr><tr><td></td><td align=center>_icongreyuparrow_</td><td colspan=8></td>\n"; 828 830 829 831 } else if (collector_page == "srce") { 832 collectorbar += "<td>_icongreyarrow_</td>\n"; 830 833 if (esrce == 1) { 831 834 // if we came from the "change an existing collection" page previous button(s) … … 843 846 collectorbar += "<td>_icongreyarrow_</td>\n"; 844 847 collectorbar += get_button (collector_page, "grey", "view", false); 845 collectorbar += "</tr><tr><td colspan= 2></td><td align=center>_icongreyuparrow_</td><td colspan=6></td>\n";848 collectorbar += "</tr><tr><td colspan=3></td><td align=center>_icongreyuparrow_</td><td colspan=6></td>\n"; 846 849 847 850 } else if (collector_page == "conf") { 851 collectorbar += "<td>_icongreyarrow_</td>\n"; 848 852 // disable appropriate buttons if we came from "change an existing collection" 849 853 // page … … 865 869 collectorbar += "<td>_icongreyarrow_</td>\n"; 866 870 collectorbar += get_button (collector_page, "grey", "view", false); 867 collectorbar += "</tr><tr><td colspan= 4></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n";871 collectorbar += "</tr><tr><td colspan=5></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n"; 868 872 869 873 } else if (collector_page == "bilddone") { 874 collectorbar += "<td>_icongreyarrow_</td>\n"; 870 875 // all previous buttons grey after build was completed 871 876 collectorbar += get_button (collector_page, "grey", "info", false); … … 878 883 collectorbar += "<td>_icongreyarrow_</td>\n"; 879 884 collectorbar += get_button (collector_page, "green", "view", true); 880 collectorbar += "</tr><tr><td colspan=6></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n"; 881 882 } else if (collector_page == "bildcancel") { 885 collectorbar += "</tr><tr><td colspan=7></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n"; 886 887 } else if (collector_page == "bildcancel" || collector_page == "bildfail") { 888 collectorbar += "<td>_icongreyarrow_</td>\n"; 883 889 // disable appropriate buttons if we came from "change an existing collection" 884 890 // page … … 973 979 } 974 980 975 if (collector_page == "bildcancel") { 976 // cancel the build 981 if (collector_page == "bildcancel" || collector_page == "bildfail") { 982 // cancel the build (we'll also use the cancel_build script to tidy 983 // up if the build failed) 977 984 gsdl_cancel_build (args, logout); 978 985 }
Note:
See TracChangeset
for help on using the changeset viewer.