diff --git a/fixtures/content.sql b/fixtures/content.sql new file mode 100644 index 000000000..03185e622 --- /dev/null +++ b/fixtures/content.sql @@ -0,0 +1,66 @@ +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40101 SET character_set_client = utf8 */; + +CREATE TABLE `content` ( + `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Class` enum('Emergence\\CMS\\Page','Emergence\\CMS\\BlogPost') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `ContextClass` varchar(255) DEFAULT NULL, + `ContextID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) NOT NULL, + `Handle` varchar(255) NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Published` timestamp NULL DEFAULT NULL, + `Visibility` enum('Public','Private') NOT NULL DEFAULT 'Public', + `Summary` text, + `LayoutClass` enum('OneColumn') DEFAULT 'OneColumn', + `LayoutConfig` json DEFAULT NULL, + PRIMARY KEY (`ID`), + UNIQUE KEY `Handle` (`Handle`), + KEY `Published` (`Published`), + KEY `CONTEXT` (`ContextClass`,`ContextID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `content` VALUES (1,'Emergence\\CMS\\BlogPost','2021-12-26 02:44:15',3,'2021-12-26 02:44:39',3,'Slate\\Courses\\Section',2,'1st post from teacher','st_post_from_teacher',3,'Published','2021-12-26 02:44:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (2,'Emergence\\CMS\\BlogPost','2021-12-26 02:46:48',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student',4,'Published','2021-12-26 02:46:48','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (3,'Emergence\\CMS\\BlogPost','2021-12-26 02:47:16',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-2',4,'Published','2021-12-26 02:47:17','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (4,'Emergence\\CMS\\BlogPost','2021-12-26 02:51:07',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2',6,'Published','2021-12-26 02:51:08','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (5,'Emergence\\CMS\\BlogPost','2021-12-26 02:51:52',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-2',6,'Published','2021-12-26 02:51:52','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (6,'Emergence\\CMS\\BlogPost','2021-12-26 02:52:13',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-3',6,'Published','2021-12-26 02:52:13','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (7,'Emergence\\CMS\\BlogPost','2021-12-26 02:53:36',4,'2021-12-26 02:53:45',4,'Slate\\Courses\\Section',2,'Post from student','post_from_student-3',4,'Published','2021-12-26 02:53:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (8,'Emergence\\CMS\\BlogPost','2021-12-26 02:54:13',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-4',4,'Published','2021-12-26 02:54:13','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (9,'Emergence\\CMS\\BlogPost','2021-12-26 02:54:33',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-5',4,'Published','2021-12-26 02:54:33','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (10,'Emergence\\CMS\\BlogPost','2021-12-26 02:55:49',3,'2021-12-26 02:56:51',3,'Slate\\Courses\\Section',2,'This is the 2nd post from teacher','this_is_the_2nd_post_from_teacher',3,'Published','2021-12-26 02:55:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (11,'Emergence\\CMS\\BlogPost','2021-12-26 02:56:24',3,'2021-12-26 02:57:01',3,'Slate\\Courses\\Section',2,'This is the 3rd post from teacher','this_is_the_3rd_post_from_teacher',3,'Published','2021-12-26 02:56:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (12,'Emergence\\CMS\\BlogPost','2021-12-26 02:57:56',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-4',6,'Published','2021-12-26 02:57:57','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (13,'Emergence\\CMS\\BlogPost','2021-12-26 02:58:20',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-5',6,'Published','2021-12-26 02:58:20','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (14,'Emergence\\CMS\\BlogPost','2021-12-26 02:58:47',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-6',6,'Published','2021-12-26 02:58:48','Public',NULL,'OneColumn',NULL); + +CREATE TABLE `history_content` ( + `RevisionID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `ID` int(10) unsigned NOT NULL, + `Class` enum('Emergence\\CMS\\Page','Emergence\\CMS\\BlogPost') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `ContextClass` varchar(255) DEFAULT NULL, + `ContextID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) NOT NULL, + `Handle` varchar(255) NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Published` timestamp NULL DEFAULT NULL, + `Visibility` enum('Public','Private') NOT NULL DEFAULT 'Public', + `Summary` text, + `LayoutClass` enum('OneColumn') DEFAULT 'OneColumn', + `LayoutConfig` json DEFAULT NULL, + PRIMARY KEY (`RevisionID`), + KEY `ID` (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `history_content` SELECT NULL AS RevisionID, `content`.* FROM `content`; \ No newline at end of file diff --git a/fixtures/content_items.sql b/fixtures/content_items.sql new file mode 100644 index 000000000..3a1052d69 --- /dev/null +++ b/fixtures/content_items.sql @@ -0,0 +1,55 @@ +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40101 SET character_set_client = utf8 */; + +CREATE TABLE `content_items` ( + `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Class` enum('Emergence\\CMS\\Item\\Album','Emergence\\CMS\\Item\\Embed','Emergence\\CMS\\Item\\Media','Emergence\\CMS\\Item\\RichText','Emergence\\CMS\\Item\\Text','Emergence\\CMS\\Item\\Markdown') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) DEFAULT NULL, + `ContentID` int(10) unsigned NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Order` int(10) unsigned DEFAULT NULL, + `Data` json NOT NULL, + PRIMARY KEY (`ID`), + KEY `ContentID` (`ContentID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `content_items` VALUES (1,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:44:15',3,'2021-12-26 02:44:39',3,NULL,1,3,'Deleted',1,'\"Here is some information about the course\\n - Lorem ipsum dolor sit amet\\n - consectetur adipiscing elit\"'); +INSERT INTO `content_items` VALUES (2,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:44:39',3,NULL,NULL,NULL,1,3,'Published',1,'\"Here is some information about the course\\n - Lorem ipsum dolor sit amet\\n - consectetur adipiscing elit\"'); +INSERT INTO `content_items` VALUES (3,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:46:48',4,NULL,NULL,NULL,2,4,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); +INSERT INTO `content_items` VALUES (4,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:47:16',4,NULL,NULL,NULL,3,4,'Published',1,'\"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (5,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:51:07',6,NULL,NULL,NULL,4,6,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); +INSERT INTO `content_items` VALUES (6,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:51:52',6,NULL,NULL,NULL,5,6,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\"'); +INSERT INTO `content_items` VALUES (7,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:52:13',6,NULL,NULL,NULL,6,6,'Published',1,'\"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (8,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:53:36',4,NULL,NULL,NULL,7,4,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\"'); +INSERT INTO `content_items` VALUES (9,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:54:13',4,NULL,NULL,NULL,8,4,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\"'); +INSERT INTO `content_items` VALUES (10,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:54:33',4,NULL,NULL,NULL,9,4,'Published',1,'\"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (11,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:55:49',3,NULL,NULL,NULL,10,3,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. \"'); +INSERT INTO `content_items` VALUES (12,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:56:24',3,NULL,NULL,NULL,11,3,'Published',1,'\"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (13,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:57:56',6,NULL,NULL,NULL,12,6,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); +INSERT INTO `content_items` VALUES (14,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:58:20',6,NULL,NULL,NULL,13,6,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\"'); +INSERT INTO `content_items` VALUES (15,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:58:47',6,NULL,NULL,NULL,14,6,'Published',1,'\"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); + +CREATE TABLE `history_content_items` ( + `RevisionID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `ID` int(10) unsigned NOT NULL, + `Class` enum('Emergence\\CMS\\Item\\Album','Emergence\\CMS\\Item\\Embed','Emergence\\CMS\\Item\\Media','Emergence\\CMS\\Item\\RichText','Emergence\\CMS\\Item\\Text','Emergence\\CMS\\Item\\Markdown') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) DEFAULT NULL, + `ContentID` int(10) unsigned NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Order` int(10) unsigned DEFAULT NULL, + `Data` json NOT NULL, + PRIMARY KEY (`RevisionID`), + KEY `ID` (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `history_content_items` SELECT NULL AS RevisionID, `content_items`.* FROM `content_items`; \ No newline at end of file diff --git a/fixtures/tag_items.sql b/fixtures/tag_items.sql new file mode 100644 index 000000000..cd3314841 --- /dev/null +++ b/fixtures/tag_items.sql @@ -0,0 +1,29 @@ +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40101 SET character_set_client = utf8 */; + +CREATE TABLE `tag_items` ( + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `ContextClass` varchar(255) DEFAULT NULL, + `ContextID` int(11) DEFAULT NULL, + `TagID` int(11) NOT NULL, + UNIQUE KEY `TagItem` (`TagID`,`ContextClass`,`ContextID`), + KEY `CONTEXT` (`ContextClass`,`ContextID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `tag_items` VALUES ('2021-12-26 02:44:16',3,'Emergence\\CMS\\AbstractContent',1,1); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:56:51',3,'Emergence\\CMS\\AbstractContent',10,1); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:01',3,'Emergence\\CMS\\AbstractContent',11,1); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:46:48',4,'Emergence\\CMS\\AbstractContent',2,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:47:16',4,'Emergence\\CMS\\AbstractContent',3,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:51:07',6,'Emergence\\CMS\\AbstractContent',4,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:51:52',6,'Emergence\\CMS\\AbstractContent',5,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:52:13',6,'Emergence\\CMS\\AbstractContent',6,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:53:45',4,'Emergence\\CMS\\AbstractContent',7,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:54:13',4,'Emergence\\CMS\\AbstractContent',8,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:54:33',4,'Emergence\\CMS\\AbstractContent',9,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:56:51',3,'Emergence\\CMS\\AbstractContent',10,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:01',3,'Emergence\\CMS\\AbstractContent',11,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:56',6,'Emergence\\CMS\\AbstractContent',12,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:58:20',6,'Emergence\\CMS\\AbstractContent',13,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:58:47',6,'Emergence\\CMS\\AbstractContent',14,2); diff --git a/fixtures/tags.sql b/fixtures/tags.sql new file mode 100644 index 000000000..3cd9bcfa4 --- /dev/null +++ b/fixtures/tags.sql @@ -0,0 +1,17 @@ +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40101 SET character_set_client = utf8 */; + +CREATE TABLE `tags` ( + `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Class` enum('Tag') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Title` varchar(255) NOT NULL, + `Handle` varchar(255) NOT NULL, + `Description` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ID`), + UNIQUE KEY `Handle` (`Handle`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `tags` VALUES (1,'Tag','2021-12-26 02:44:16',3,'info','info',NULL); +INSERT INTO `tags` VALUES (2,'Tag','2021-12-26 02:46:48',4,'comment','comment',NULL); diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index e024da833..af4280701 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -30,43 +30,19 @@ {$Section = $data} - scope['limit'] = 10; - $options = [ - 'limit' => $this->scope['limit'], - 'offset' => $_GET['offset'] ?: 0, - 'calcFoundRows' => 'yes', - 'conditions' => [] - ]; - - $sectionTeacherIds = array_map(function($Teacher) { - return $Teacher->ID; - }, $this->scope['Section']->ActiveTeachers); - - $latestTeacherPost = \Emergence\CMS\BlogPost::getAllPublishedByContextObject($this->scope['Section'], array_merge_recursive($options, [ - 'conditions' => [ - 'AuthorID' => [ - 'operator' => 'IN', - 'values' => $sectionTeacherIds - ] - ], - 'limit' => 1 - ])); - - if (count($latestTeacherPost)) { - $this->scope['latestTeacherPost'] = $latestTeacherPost[0]; - $options['conditions'][] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); - } - - $this->scope['blogPosts'] = \Emergence\CMS\BlogPost::getAllPublishedByContextObject($this->scope['Section'], $options); - $this->scope['total'] = DB::foundRows(); - ?> -
-

{$Section->getTitle()|escape} Public Feed

+

+ {$Section->getTitle()|escape} + + Public Feed + {if $blogTag} + for tag {$blogTag->getTitle()|escape} + {/if} + +

Create a Post
@@ -95,38 +71,45 @@
-
-

{$Section->Code|escape}

- - {if $Section->Course->Description} -
{$Section->Course->Description|escape|markdown}
- {/if} - -
-
-
Term
-
{$Section->Term->Title}
-
- - {if $.User} -
-
Schedule
-
{$Section->Schedule->Title}
-
-
-
Location
-
{$Section->Location->Title}
+
+
+

+
+
+ {$Section->Code|escape} +

+ + {if $Section->Course->Description} +
{$Section->Course->Description|escape|markdown}
{/if} - {if $Section->Notes} +
-
Notes
-
{$Section->Notes|escape|markdown}
+
Term
+
{$Section->Term->Title}
- {/if} -
-
+ + {if $.User} +
+
Schedule
+
{$Section->Schedule->Title}
+
+
+
Location
+
{$Section->Location->Title}
+
+ {/if} + + {if $Section->Notes} +
+
Notes
+
{$Section->Notes|escape|markdown}
+
+ {/if} +
+
+
{template linksEntry entry} {if $entry.href}{/if} @@ -135,9 +118,22 @@ {/template} {foreach item=linkGroup from=Slate\UI\SectionProfile::getLinks($Section)} + {* spaces in key names here are parsed wrong *} + {$linksIcons = array( + 'CourseTools' => 'wrench', + 'OtherWebsites' => 'external-link', + )} + {$labelNoSpaces = str_replace(' ', '', $linkGroup.label)} +
-

{linksEntry $linkGroup}

+

+
+ +
+ + {linksEntry $linkGroup} +

{foreach item=link from=$linkGroup.children} @@ -157,27 +153,91 @@
{/foreach} -

Teacher{tif count($Section->ActiveTeachers) != 1 ? s}

-
    - {foreach item=Teacher from=$Section->ActiveTeachers} -
  • {personLink $Teacher photo=true}
    • - {foreachelse} -

    No instructors currently listed.

    - {/foreach} -
+ {if count($tags) > 0} +
+
+

+ + + + Blog Tags +

+ + {* if there's 10 or more, show the first five and collapse the rest *} + {if count($tags) >= 10} + {$tagsShown = array_slice($tags, 0, 5)} + {$tagsHidden = array_slice($tags, 5)} + {else} + {* less than 10, just show them all *} + {$tagsShown = $tags} + {/if} - {if $.User} -

Students

-
    - {foreach item=Student from=$Section->ActiveStudents} -
  • {personLink $Student photo=true}
    • - {foreachelse} -

    No students currently listed.

    - {/foreach} -
+ + + {if $tagsHidden} +
+ + See all + See less + + + +
+ {/if} +
+
{/if} +
+
+

+ + + + Teacher{tif count($Section->ActiveTeachers) != 1 ? s} +

+
    + {foreach item=Teacher from=$Section->ActiveTeachers} +
  • {personLink $Teacher photo=true}
    • + {foreachelse} +

    No instructors currently listed.

    + {/foreach} +
+
+
+ + {if $.User} +
+
+

+ + + + Students +

+
    + {foreach item=Student from=$Section->ActiveStudents} +
  • {personLink $Student photo=true}
    • + {foreachelse} +

    No students currently listed.

    + {/foreach} +
+
+
+ {/if}
-{/block} \ No newline at end of file +{/block} diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index a6c3b60cf..8a0afbd07 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -6,12 +6,14 @@ use HandleBehavior; use DuplicateKeyException; use TableNotFoundException; +use TagItem; use Emergence\People\IPerson; use Emergence\People\Person; use Emergence\People\User; use Emergence\Locations\Location; use Emergence\Connectors\Mapping; +use Emergence\CMS\BlogPost; use Slate\Term; use Slate\Courses\SectionParticipant; @@ -186,7 +188,13 @@ class Section extends \VersionedRecord ,'class' => Mapping::class ,'contextClass' => __CLASS__ ] - ]; + ,'BlogPosts' => [ + 'type' => 'one-many' + ,'class' => BlogPost::class + ,'contextClass' => __CLASS__ + ,'foreign' => 'ContextID' + ] + ]; public static $validators = [ 'Course' => [ @@ -411,6 +419,69 @@ public function getCohorts() } } + public function findBlogTags() + { + return TagItem::getTagsSummary([ + 'Class' => BlogPost::class, + 'classConditions' => [ + 'ContextClass' => static::getStaticRootClass(), + 'ContextID' => $this->ID + ] + ]); + } + + public function findBlogPosts($conditions, $limit, $offset, $tag) + { + $options = [ + 'limit' => $limit, + 'offset' => $offset, + 'calcFoundRows' => 'yes', + 'conditions' => $conditions + ]; + + if ($tag!=null) { + + $tagItemIDs = DB::allValues( + 'ContextID', + 'SELECT ContextID FROM `tag_items` WHERE (`ContextClass` = "%s") AND (`TagID` = %u)', + [ + DB::escape(BlogPost::getStaticRootClass()), + $tag->ID + ] + ); + + $options = array_merge_recursive($options, [ + 'conditions' => [ + 'ID' => [ + 'operator' => 'IN', + 'values' => count($tagItemIDs) ? $tagItemIDs : '0' + ] + ] + ]); + } + + return BlogPost::getAllPublishedByContextObject($this, $options); + } + + public function findLatestTeacherPost() + { + $sectionTeacherIds = array_map(function($Teacher) { + return $Teacher->ID; + }, $this->ActiveTeachers); + + $latestTeacherPost = BlogPost::getAllPublishedByContextObject($this, array_merge_recursive([ + 'conditions' => [ + 'AuthorID' => [ + 'operator' => 'IN', + 'values' => $sectionTeacherIds + ] + ], + 'limit' => 1 + ])); + + return count($latestTeacherPost) ? $latestTeacherPost[0] : null; + } + // search SQL generators protected static function getTeacherSearchSql($term, $condition) { diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index 85dab1894..e515043b4 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -5,6 +5,7 @@ use DB; use ActiveRecord; use DuplicateKeyException; +use Tag; use Emergence\People\Person; use Emergence\People\User; @@ -110,11 +111,53 @@ public static function handleRecordRequest(ActiveRecord $Section, $action = fals ])); case 'students': return static::handleStudentsRequest($Section); + case '': + case false: + return static::handleSectionRequest($Section, $action); default: return parent::handleRecordRequest($Section, $action); } } + public static function handleSectionRequest(Section $Section, $action) + { + $className = static::$recordClass; + + $limit = isset($_REQUEST['limit']) && ctype_digit($_REQUEST['limit']) ? (integer)$_REQUEST['limit'] : 10; + $offset = isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset']) ? (integer)$_REQUEST['offset'] : 0; + $handle = $_REQUEST['blog-tag']; + + $conditions = []; + $latestTeacherPost = false; + $tag = null; + + if ($handle) { + $tag = Tag::getByHandle($handle); + + if (!$tag) { + return static::throwNotFoundError('tag not found'); + } + } else { + $latestTeacherPost = $Section->findLatestTeacherPost(); + + if ($latestTeacherPost) { + $conditions[] = sprintf('ID != %u', $latestTeacherPost->ID); + } + } + + return static::respond(static::getTemplateName($className::$singularNoun), array( + 'success' => true + ,'data' => $Section + ,'tags' => $Section->findBlogTags() + ,'blogTag' => $tag + ,'latestTeacherPost' => $latestTeacherPost + ,'blogPosts' => $Section->findBlogPosts($conditions, $limit ?: 4, $offset, $tag ) + ,'total' => DB::foundRows() + ,'limit' => $limit + ,'offset' => $offset + )); + } + public static function handleCohortsRequest(Section $Section) { return static::respond('sectionCohorts', [ diff --git a/site-root/sass/slate/_common.scss b/site-root/sass/slate/_common.scss index 2324fc178..a60173a13 100644 --- a/site-root/sass/slate/_common.scss +++ b/site-root/sass/slate/_common.scss @@ -45,13 +45,33 @@ body { } } -.text-left { text-align: left !important; } -.text-right { text-align: right !important; } -.text-center { text-align: center !important; } -.text-justify { text-align: justify !important; } -.text-nowrap { white-space: nowrap !important; } -.text-nolead { margin-top: 0 !important; } -.text-notrail { margin-bottom: 0 !important; } +.text-left { + text-align: left !important; +} + +.text-right { + text-align: right !important; +} + +.text-center { + text-align: center !important; +} + +.text-justify { + text-align: justify !important; +} + +.text-nowrap { + white-space: nowrap !important; +} + +.text-nolead { + margin-top: 0 !important; +} + +.text-notrail { + margin-bottom: 0 !important; +} .sidebar-item { margin: 1em 0 3em; @@ -59,6 +79,40 @@ body { .empty-text { margin: .5em 0; } + + .sidebar-collapsible-toggle { + background-color: rgba($text-color, .05); + border-radius: .25em; + cursor: pointer; + font-size: .75em; + margin-top: 1em; + padding: .25em; + text-align: center; + text-transform: uppercase; + + &:hover, + &:focus { + background-color: rgba($text-color, .1); + } + } + + .collapsible-collapse-text { + display: none; + } + + .sidebar-collapsible[open] { + >.sidebar-collapsible-toggle { + margin-bottom: 1em; + } + + .collapsible-expand-text { + display: none; + } + + .collapsible-collapse-text { + display: unset; + } + } } .sidebar-item-title { @@ -94,7 +148,7 @@ body { width: 250px; } - > .inner { + >.inner { background-position: center; background-repeat: no-repeat; background-size: cover; @@ -111,4 +165,4 @@ body { margin: 1em 0 0; } } -} \ No newline at end of file +} diff --git a/site-root/sass/slate/_modules.scss b/site-root/sass/slate/_modules.scss index e243bb362..f0956ea03 100644 --- a/site-root/sass/slate/_modules.scss +++ b/site-root/sass/slate/_modules.scss @@ -15,5 +15,6 @@ @import 'modules/slate-menu'; @import 'modules/source-grid'; @import 'modules/splitview'; +@import 'modules/tag-list'; @import 'modules/todo'; -@import 'modules/wizards'; \ No newline at end of file +@import 'modules/wizards'; diff --git a/site-root/sass/slate/modules/_key-value-list.scss b/site-root/sass/slate/modules/_key-value-list.scss index 7391c7371..cf6b8d626 100644 --- a/site-root/sass/slate/modules/_key-value-list.scss +++ b/site-root/sass/slate/modules/_key-value-list.scss @@ -13,6 +13,7 @@ .kv-key, .kv-value { margin: 0; + padding: 0; } .kv-key { @@ -34,12 +35,16 @@ .kv-pair { display: table-row; } - + .kv-key, - .kv-value { + .kv-value, + > .kv-key, + > .kv-value { display: table-cell; + padding-bottom: 0; + padding-top: 0; } - + .kv-key { padding-right: 1em; } @@ -51,4 +56,4 @@ .kv-key { text-align: right; } -} \ No newline at end of file +} diff --git a/site-root/sass/slate/modules/_people.scss b/site-root/sass/slate/modules/_people.scss index c6e271f8b..a9937d3a0 100644 --- a/site-root/sass/slate/modules/_people.scss +++ b/site-root/sass/slate/modules/_people.scss @@ -2,40 +2,42 @@ @include background-size(cover); } -$roster-avatar-size: 64px; -$roster-item-width: $roster-avatar-size * 1.3125; -$roster-font-size: $font-size * .6875; -$roster-line-height: $line-height * .8; - .roster { + display: grid; + grid-gap: 1em .5em; + grid-template-columns: repeat(3, 1fr); margin: 0; padding: 0; - + li { - display: inline-block; - font-size: $roster-font-size; - height: $roster-avatar-size + (($roster-line-height * $roster-font-size) * 2.5); - line-height: $roster-line-height; + font-size: .75em; + line-height: 1.25; list-style: none; - margin-bottom: .75em; - overflow: hidden; + min-width: 0; text-align: center; - vertical-align: text-bottom; - width: $roster-item-width; } - + a { + display: block; text-decoration: none; - + &:hover, &:focus { text-decoration: underline; } } - + .avatar { + border-radius: 100%; + box-shadow: 0 1px 2px rgba(0,0,0,.1); margin: 0 auto .25em; } + + .name { + display: block; + overflow: hidden; + text-overflow: ellipsis; + } } .about-bio { @@ -43,7 +45,7 @@ $roster-line-height: $line-height * .8; color: inherit; font-size: 1em; } - + .well-title { color: $heading-color; font-size: 1.2em; @@ -58,4 +60,4 @@ $roster-line-height: $line-height * .8; text-overflow: ellipsis; white-space: nowrap; } -} \ No newline at end of file +} diff --git a/site-root/sass/slate/modules/_tag-list.scss b/site-root/sass/slate/modules/_tag-list.scss new file mode 100644 index 000000000..ba0dad9aa --- /dev/null +++ b/site-root/sass/slate/modules/_tag-list.scss @@ -0,0 +1,30 @@ +.tag-list { + list-style: none; + margin: 0; + padding: 0; + + >li { + display: inline-block; + } + + .tag { + background-color: rgba($link-color, .05); + border-radius: .25em; + display: block; + font-size: .875em; + margin-bottom: .25em; + padding: 0 .5em; + text-decoration: none; + + &:hover, + &:focus { + background-color: rgba($link-color, .1); + } + } + + .tag-count { + color: rgba($text-color, .4); + font-size: .75em; + font-weight: bold; + } +}