3 files changed, 12 insertions, 0 deletions
diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c
index 4783d13..16d0276 100644
--- a/libtemplate/templateview.c
+++ b/libtemplate/templateview.c
@@ -1030,6 +1030,7 @@ void cTemplateViewMenu::SetViewElements(void) {
     viewElementsAllowed.insert("systemload");
     viewElementsAllowed.insert("timers");
     viewElementsAllowed.insert("devices");
+    viewElementsAllowed.insert("currentschedule");
     viewElementsAllowed.insert("scrollbar");
     viewElementsAllowed.insert("detailheader");
     viewElementsAllowed.insert("tablabels");
@@ -1108,6 +1109,9 @@ string cTemplateViewMenu::GetViewElementName(eViewElement ve) {
         case veTimers:
             name = "Timers";
             break;
+        case veCurrentSchedule:
+            name = "Current Schedule";
+            break;
         case veDevices:
             name = "Devices";
             break;
@@ -1217,6 +1221,8 @@ void cTemplateViewMenu::AddPixmap(string sViewElement, cTemplatePixmap *pix, vec
         ve = veSystemLoad;
     } else if (!sViewElement.compare("timers")) {
         ve = veTimers;
+    } else if (!sViewElement.compare("currentschedule")) {
+        ve = veCurrentSchedule;
     } else if (!sViewElement.compare("devices")) {
         ve = veDevices;
     } else if (!sViewElement.compare("scrollbar")) {
@@ -1238,6 +1244,9 @@ void cTemplateViewMenu::AddPixmap(string sViewElement, cTemplatePixmap *pix, vec
     if (hit == viewElements.end()) {
         cTemplateViewElement *viewElement = new cTemplateViewElement();
         viewElement->SetParameters(viewElementattributes);
+        if (viewElement->DebugTokens()) {
+            dsyslog("skindesigner: activating token debugging for view element %s", sViewElement.c_str());
+        }
         viewElement->AddPixmap(pix);
         viewElements.insert(pair< eViewElement, cTemplateViewElement*>(ve, viewElement));
     } else {
diff --git a/libtemplate/templateviewelement.h b/libtemplate/templateviewelement.h
index 6d148e7..a2bd05a 100644
--- a/libtemplate/templateviewelement.h
+++ b/libtemplate/templateviewelement.h
@@ -44,6 +44,7 @@ enum eViewElement {
     veDiscUsage,
     veSystemLoad,
     veTimers,
+    veCurrentSchedule,
     veMenuItem,
     veMenuCurrentItemDetail,
     veScrollbar,
diff --git a/libtemplate/xmlparser.c b/libtemplate/xmlparser.c
index 8931f2f..ce39dcc 100644
--- a/libtemplate/xmlparser.c
+++ b/libtemplate/xmlparser.c
@@ -514,7 +514,9 @@ bool cXmlParser::ParseSubView(xmlNodePtr node) {
         }
 
         if (subView->ValidViewElement((const char*)childNode->name)) {
+            xmlAttrPtr attr = childNode->properties;
             vector<pair<string, string> > attribs;
+            ParseAttributes(attr, childNode, attribs);
             ParseViewElement(childNode->name, childNode->xmlChildrenNode, attribs, subView);
         } else if (subView->ValidViewList((const char*)childNode->name)) {
             ParseViewList(childNode, subView);