← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/filesystem/browser/media/specialhome.js

  • Committer: David Coles
  • Date: 2010-07-28 10:45:53 UTC
  • mfrom: (1829 trunk)
  • mto: This revision was merged to the branch mainline in revision 1830.
  • Revision ID: coles.david@gmail.com-20100728104553-5z3nxt0l6kyfqfh5
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/filesystem/browser/media/specialhome.js
65
65
        var subject = subjects[i];
66
66
        var subjpath = subject.subj_short_name;
67
67
        // Header, with link to offering home page.
68
 
        h3 = $('<h3><span class="subjname"></span><span style="font-weight: normal"><span class="semester"></span> &ndash; <a class="subjectaction">Subject home</a></span>');
 
68
        h3 = $('<h3><span class="subjname"></span><span style="font-weight: normal"><span class="semester"></span> &ndash; <a class="subjectaction">Subject home</a></span></h3>');
69
69
        h3.find('.subjname').text(subject.subj_name);
70
70
        /* Non-current offerings need to show the semester, to avoid confusion
71
71
         * about which offering we are talking about */
72
72
        if (subject.state != "current")
73
73
        {
74
 
            h3.find('.semester').text(" (" + subject.year + ", semester "
75
 
                                      + subject.semester + ")");
 
74
            h3.find('.semester').text(" (" + subject.year + " " + subject.semester_display + ")");
76
75
        }
77
76
        h3.find('a').attr('href', subject.url);
78
77
        $(specialhomediv).append(h3);
91
90
            var group = subject.groups[j];
92
91
            ul.appendChild(make_subject_item(subjpath,
93
92
                path_join("groups", subject.subj_short_name + "_" +
94
 
                          subject.year + "_" + subject.semester + "_" +
 
93
                          subject.year + "_" + subject.semester_url + "_" +
95
94
                          group.name),
96
95
                group.name,
97
96
                "This group's files in this subject"));