Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved style sheeta from the styles directory to css so as to match changes to NarrativeWeb.

Browse Source 
svn: r19024
This commit is contained in:
Rob G. Healey 2012-03-08 15:09:10 +00:00
parent c1ff037027
commit c11615fe49
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/webreport/WebCal.py
View File

@ -315,21 +315,18 @@ class WebCalReport(Report):
# Copy the screen stylesheet # Copy the screen stylesheet
if self.css: if self.css:
fname = CSS[self.css]["filename"] fname = CSS[self.css]["filename"]
self.copy_file(fname, _CALENDARSCREEN, "styles") self.copy_file(fname, _CALENDARSCREEN, "css")
# copy Navigation Menu Layout if Blue or Visually is being used # copy Navigation Menu Layout if Blue or Visually is being used
if CSS[self.css]["navigation"]: if CSS[self.css]["navigation"]:
# if there are multiple years, add Horizontal else add Fade... # copy horizontal menus...
if self.multiyear: fname = CSS["Horizontal-Menus"]["filename"]
fname = CSS["Horizontal-Menus"]["filename"] self.copy_file(fname, "calendar-menus.css", "css")
else:
fname = CSS["Fade-Menus"]["filename"]
self.copy_file(fname, "calendar-menus.css", "styles")
# copy print stylesheet # copy print stylesheet
fname = CSS["Print-Default"]["filename"] fname = CSS["Print-Default"]["filename"]
self.copy_file(fname, _CALENDARPRINT, "styles") self.copy_file(fname, _CALENDARPRINT, "css")
imgs = [] imgs = []
@ -416,7 +413,7 @@ class WebCalReport(Report):
fname1 = "/".join(subdirs + ["images", "favicon2.ico"]) fname1 = "/".join(subdirs + ["images", "favicon2.ico"])
# _CALENDARSCREEN stylesheet # _CALENDARSCREEN stylesheet
fname2 = "/".join(subdirs + ["styles", _CALENDARSCREEN]) fname2 = "/".join(subdirs + ["css", _CALENDARSCREEN])
# links for GRAMPS favicon and stylesheets # links for GRAMPS favicon and stylesheets
links = Html("link", rel = 'shortcut icon', href = fname1, type = "image/x-icon") + ( links = Html("link", rel = 'shortcut icon', href = fname1, type = "image/x-icon") + (
@ -425,14 +422,14 @@ class WebCalReport(Report):
# add horizontal menu if css == Blue or Visually because there is no menus? # add horizontal menu if css == Blue or Visually because there is no menus?
if CSS[self.css]["navigation"]: if CSS[self.css]["navigation"]:
fname = "/".join(subdirs + ["styles", "calendar-menus.css"]) fname = "/".join(subdirs + ["css", "calendar-menus.css"])
links.extend( links.extend(
Html("link", href = fname, type = "text/css", media = "screen", rel = "stylesheet", indent = False) Html("link", href = fname, type = "text/css", media = "screen", rel = "stylesheet", indent = False)
) )
# add printer stylesheet to webcalendar() and one_day() only # add printer stylesheet to webcalendar() and one_day() only
if add_print: if add_print:
fname = "/".join(subdirs + ["styles", _CALENDARPRINT]) fname = "/".join(subdirs + ["css", _CALENDARPRINT])
links.extend( links.extend(
Html("link",href = fname,type = "text/css", media = "print", rel = "stylesheet", indent = False) Html("link",href = fname,type = "text/css", media = "print", rel = "stylesheet", indent = False)
) )
@ -845,7 +842,7 @@ class WebCalReport(Report):
body += self.month_navigation(nr_up, year, currentsection, True) body += self.month_navigation(nr_up, year, currentsection, True)
# build the calendar # build the calendar
content = Html("div", class_="content") content = Html("div", class_="content", id = "WebCal")
body += content body += content
monthly_calendar = self.calendar_build("wc", year, month) monthly_calendar = self.calendar_build("wc", year, month)
content += monthly_calendar content += monthly_calendar
@ -913,11 +910,11 @@ class WebCalReport(Report):
'that date, if there are any.\n')) 'that date, if there are any.\n'))
# page description # page description
content = Html("div", class_ = "content") + ( content = Html("div", class_ = "content", id = "YearGlance")
Html("p", msg, id='description')
)
body += content body += content
content += Html("p", msg, id='description')
for month in range(1, 13): for month in range(1, 13):
# build the calendar # build the calendar
@ -974,7 +971,7 @@ class WebCalReport(Report):
body += self.month_navigation(nr_up, year, currentsection, True) body += self.month_navigation(nr_up, year, currentsection, True)
# set date display as in user prevferences # set date display as in user prevferences
content = Html("div", class_="content") content = Html("div", class_="content", id = "OneDay")
body += content body += content
content += Html("h3", _dd.display(event_date), inline = True) content += Html("h3", _dd.display(event_date), inline = True)