Skip to content
Permalink
Browse files

Internal: Subtitle representation.

  • Loading branch information...
kohler committed Oct 1, 2019
1 parent 1cde758 commit c83ebe67922fa4b4e40eb355de06804fc7cea343
Showing with 14 additions and 13 deletions.
  1. +1 −1 autoassign.php
  2. +1 −1 bulkassign.php
  3. +1 −1 conflictassign.php
  4. +1 −1 manualassign.php
  5. +1 −1 settings.php
  6. +9 −8 src/conference.php
@@ -422,7 +422,7 @@ function run() {
}
}
$Conf->header(["Assignments", "Automatic"], "autoassign");
$Conf->header("Assignments", "autoassign", ["subtitle" => "Automatic"]);
echo '<div class="psmode">',
'<div class="papmode active"><a href="', hoturl("autoassign"), '">Automatic</a></div>',
'<div class="papmode"><a href="', hoturl("manualassign"), '">Manual</a></div>',
@@ -92,7 +92,7 @@ function complete_assignment($qreq, $callback) {
}
$Conf->header(["Assignments", "Bulk update"], "bulkassign");
$Conf->header("Assignments", "bulkassign", ["subtitle" => "Bulk update"]);
echo '<div class="psmode">',
'<div class="papmode"><a href="', hoturl("autoassign"), '">Automatic</a></div>',
'<div class="papmode"><a href="', hoturl("manualassign"), '">Manual</a></div>',
@@ -8,7 +8,7 @@
$Me->escape();
$Me->add_overrides(Contact::OVERRIDE_CONFLICT);
$Conf->header(["Assignments", "Conflicts"], "assignpc");
$Conf->header("Assignments", "assignpc", ["subtitle" => "Conflicts"]);
echo '<div class="psmode">',
'<div class="papmode"><a href="', hoturl("autoassign"), '">Automatic</a></div>',
'<div class="papmode"><a href="', hoturl("manualassign"), '">Manual</a></div>',
@@ -105,7 +105,7 @@ function saveAssignments($qreq, $reviewer) {
Conf::msg_error("You need to select a reviewer.");
$Conf->header(["Assignments", "Manual"], "assignpc");
$Conf->header("Assignments", "assignpc", ["subtitle" => "Manual"]);
echo '<div class="psmode">',
'<div class="papmode"><a href="', $Conf->hoturl("autoassign"), '">Automatic</a></div>',
'<div class="papmode active"><a href="', $Conf->hoturl("manualassign"), '">Manual</a></div>',
@@ -53,7 +53,7 @@ function choose_setting_group($qreq, SettingValues $sv) {
$Sv->crosscheck();
$group_titles = $Sv->group_titles();
$Conf->header(["Settings", $group_titles[$Group], true], "settings");
$Conf->header("Settings", "settings", ["subtitle" => $group_titles[$Group]]);
echo Ht::unstash(); // clear out other script references
echo $Conf->make_script_file("scripts/settings.js"), "\n";
@@ -3263,7 +3263,7 @@ function set_cookie($name, $value, $expires_at) {
hotcrp_setcookie($name, $value, $opt);
}
function header_head($title, $extra = null) {
function header_head($title, $extra = []) {
global $Me, $Now, $ConfSitePATH;
// clear session list cookies
foreach ($_COOKIE as $k => $v)
@@ -3373,7 +3373,7 @@ function header_head($title, $extra = null) {
$huser->cid = $Me->contactId;
Ht::stash_script("hotcrp_user=" . json_encode_browser($huser) . ";");
$pid = $extra ? get($extra, "paperId") : null;
$pid = get($extra, "paperId");
$pid = $pid && ctype_digit($pid) ? (int) $pid : 0;
if (!$pid && $this->paper)
$pid = $this->paper->paperId;
@@ -3407,7 +3407,7 @@ function has_interesting_deadline($my_deadlines) {
return false;
}
function header_body($title, $id, $extra = null) {
function header_body($title, $id, $extra = []) {
global $ConfSitePATH, $Me, $Now;
echo "<body";
if ($id)
@@ -3443,8 +3443,9 @@ function header_body($title, $id, $extra = null) {
. $this->hoturl("index", ["cap" => null])
. '"><span class="header-site-name">'
. htmlspecialchars($this->short_name) . '</span>';
if (!$is_home)
if (!$is_home) {
$site_div .= ' Home';
}
$site_div .= '</a></h1></div>';
// $header_profile
@@ -3497,9 +3498,9 @@ function header_body($title, $id, $extra = null) {
$action_bar = actionBar();
$title_div = get($extra, "title_div");
if (!$title_div) {
if (is_array($title))
$title = $title[0] . " &nbsp;&#x2215;&nbsp; <strong>" . $title[1] . "</strong>";
if ($title_div === null) {
if (($subtitle = get($extra, "subtitle")))
$title .= " &nbsp;&#x2215;&nbsp; <strong>" . $subtitle . "</strong>";
if ($title && $title !== "Home")
$title_div = '<div id="header-page"><h1>' . $title . '</h1></div>';
else if ($action_bar)
@@ -3564,7 +3565,7 @@ function header_body($title, $id, $extra = null) {
}
}
function header($title, $id, $extra = null) {
function header($title, $id, $extra = []) {
if (!$this->headerPrinted) {
$this->header_head($title, $extra);
$this->header_body($title, $id, $extra);

0 comments on commit c83ebe6

Please sign in to comment.
You can’t perform that action at this time.