Skip to content

Commit 89ee928

Browse files
author
epriestley
committedJul 16, 2013
Share rendering code for embedded votes and vote detail
Summary: We have two separate pieces of rendering code and both are pretty ugly. Move them toward being more reasonable. This could no doubt be improved: - Getting a text style which was readable on both the dark and light bars was hard, maybe we should change the colors or maybe I am just bad. - Could probably benefit from actual competent design in general. - JS magic is temporarily ineffective, I'll restore that in the future. - Embed style is a little funky (margin/centering). - Could use a little cleanup. Test Plan: {F50226} {F50227} {F50228} Reviewers: chad, btrahan Reviewed By: btrahan CC: aran Differential Revision: https://secure.phabricator.com/D6465
1 parent 0a3c03d commit 89ee928

9 files changed

+472
-484
lines changed
 

‎src/__celerity_resource_map__.php

+46-46
Original file line numberDiff line numberDiff line change
@@ -3475,7 +3475,7 @@
34753475
),
34763476
'phabricator-slowvote-css' =>
34773477
array(
3478-
'uri' => '/res/d1c2e05a/rsrc/css/application/slowvote/slowvote.css',
3478+
'uri' => '/res/11373549/rsrc/css/application/slowvote/slowvote.css',
34793479
'type' => 'css',
34803480
'requires' =>
34813481
array(
@@ -3702,7 +3702,7 @@
37023702
),
37033703
'phabricator-zindex-css' =>
37043704
array(
3705-
'uri' => '/res/99a9447b/rsrc/css/core/z-index.css',
3705+
'uri' => '/res/a50437bf/rsrc/css/core/z-index.css',
37063706
'type' => 'css',
37073707
'requires' =>
37083708
array(
@@ -4149,7 +4149,7 @@
41494149
), array(
41504150
'packages' =>
41514151
array(
4152-
'c01cebae' =>
4152+
'f32a863a' =>
41534153
array(
41544154
'name' => 'core.pkg.css',
41554155
'symbols' =>
@@ -4197,7 +4197,7 @@
41974197
40 => 'phabricator-property-list-view-css',
41984198
41 => 'phabricator-tag-view-css',
41994199
),
4200-
'uri' => '/res/pkg/c01cebae/core.pkg.css',
4200+
'uri' => '/res/pkg/f32a863a/core.pkg.css',
42014201
'type' => 'css',
42024202
),
42034203
'75ccea43' =>
@@ -4391,16 +4391,16 @@
43914391
'reverse' =>
43924392
array(
43934393
'aphront-attached-file-view-css' => 'adc3c36d',
4394-
'aphront-dialog-view-css' => 'c01cebae',
4395-
'aphront-error-view-css' => 'c01cebae',
4396-
'aphront-form-view-css' => 'c01cebae',
4397-
'aphront-list-filter-view-css' => 'c01cebae',
4398-
'aphront-pager-view-css' => 'c01cebae',
4399-
'aphront-panel-view-css' => 'c01cebae',
4400-
'aphront-table-view-css' => 'c01cebae',
4401-
'aphront-tokenizer-control-css' => 'c01cebae',
4402-
'aphront-tooltip-css' => 'c01cebae',
4403-
'aphront-typeahead-control-css' => 'c01cebae',
4394+
'aphront-dialog-view-css' => 'f32a863a',
4395+
'aphront-error-view-css' => 'f32a863a',
4396+
'aphront-form-view-css' => 'f32a863a',
4397+
'aphront-list-filter-view-css' => 'f32a863a',
4398+
'aphront-pager-view-css' => 'f32a863a',
4399+
'aphront-panel-view-css' => 'f32a863a',
4400+
'aphront-table-view-css' => 'f32a863a',
4401+
'aphront-tokenizer-control-css' => 'f32a863a',
4402+
'aphront-tooltip-css' => 'f32a863a',
4403+
'aphront-typeahead-control-css' => 'f32a863a',
44044404
'differential-changeset-view-css' => 'dd27a69b',
44054405
'differential-core-view-css' => 'dd27a69b',
44064406
'differential-inline-comment-editor' => '504ca7d2',
@@ -4414,7 +4414,7 @@
44144414
'differential-table-of-contents-css' => 'dd27a69b',
44154415
'diffusion-commit-view-css' => 'c8ce2d88',
44164416
'diffusion-icons-css' => 'c8ce2d88',
4417-
'global-drag-and-drop-css' => 'c01cebae',
4417+
'global-drag-and-drop-css' => 'f32a863a',
44184418
'inline-comment-summary-css' => 'dd27a69b',
44194419
'javelin-aphlict' => '75ccea43',
44204420
'javelin-behavior' => 'a9f14d76',
@@ -4488,55 +4488,55 @@
44884488
'javelin-util' => 'a9f14d76',
44894489
'javelin-vector' => 'a9f14d76',
44904490
'javelin-workflow' => 'a9f14d76',
4491-
'lightbox-attachment-css' => 'c01cebae',
4491+
'lightbox-attachment-css' => 'f32a863a',
44924492
'maniphest-task-summary-css' => 'adc3c36d',
44934493
'maniphest-transaction-detail-css' => 'adc3c36d',
4494-
'phabricator-action-list-view-css' => 'c01cebae',
4495-
'phabricator-application-launch-view-css' => 'c01cebae',
4494+
'phabricator-action-list-view-css' => 'f32a863a',
4495+
'phabricator-application-launch-view-css' => 'f32a863a',
44964496
'phabricator-busy' => '75ccea43',
44974497
'phabricator-content-source-view-css' => 'dd27a69b',
4498-
'phabricator-core-css' => 'c01cebae',
4499-
'phabricator-crumbs-view-css' => 'c01cebae',
4498+
'phabricator-core-css' => 'f32a863a',
4499+
'phabricator-crumbs-view-css' => 'f32a863a',
45004500
'phabricator-drag-and-drop-file-upload' => '504ca7d2',
45014501
'phabricator-dropdown-menu' => '75ccea43',
45024502
'phabricator-file-upload' => '75ccea43',
4503-
'phabricator-filetree-view-css' => 'c01cebae',
4504-
'phabricator-flag-css' => 'c01cebae',
4505-
'phabricator-form-view-css' => 'c01cebae',
4506-
'phabricator-header-view-css' => 'c01cebae',
4503+
'phabricator-filetree-view-css' => 'f32a863a',
4504+
'phabricator-flag-css' => 'f32a863a',
4505+
'phabricator-form-view-css' => 'f32a863a',
4506+
'phabricator-header-view-css' => 'f32a863a',
45074507
'phabricator-hovercard' => '75ccea43',
4508-
'phabricator-jump-nav' => 'c01cebae',
4508+
'phabricator-jump-nav' => 'f32a863a',
45094509
'phabricator-keyboard-shortcut' => '75ccea43',
45104510
'phabricator-keyboard-shortcut-manager' => '75ccea43',
4511-
'phabricator-main-menu-view' => 'c01cebae',
4511+
'phabricator-main-menu-view' => 'f32a863a',
45124512
'phabricator-menu-item' => '75ccea43',
4513-
'phabricator-nav-view-css' => 'c01cebae',
4513+
'phabricator-nav-view-css' => 'f32a863a',
45144514
'phabricator-notification' => '75ccea43',
4515-
'phabricator-notification-css' => 'c01cebae',
4516-
'phabricator-notification-menu-css' => 'c01cebae',
4517-
'phabricator-object-item-list-view-css' => 'c01cebae',
4515+
'phabricator-notification-css' => 'f32a863a',
4516+
'phabricator-notification-menu-css' => 'f32a863a',
4517+
'phabricator-object-item-list-view-css' => 'f32a863a',
45184518
'phabricator-object-selector-css' => 'dd27a69b',
45194519
'phabricator-phtize' => '75ccea43',
45204520
'phabricator-prefab' => '75ccea43',
45214521
'phabricator-project-tag-css' => 'adc3c36d',
4522-
'phabricator-property-list-view-css' => 'c01cebae',
4523-
'phabricator-remarkup-css' => 'c01cebae',
4522+
'phabricator-property-list-view-css' => 'f32a863a',
4523+
'phabricator-remarkup-css' => 'f32a863a',
45244524
'phabricator-shaped-request' => '504ca7d2',
4525-
'phabricator-side-menu-view-css' => 'c01cebae',
4526-
'phabricator-standard-page-view' => 'c01cebae',
4527-
'phabricator-tag-view-css' => 'c01cebae',
4525+
'phabricator-side-menu-view-css' => 'f32a863a',
4526+
'phabricator-standard-page-view' => 'f32a863a',
4527+
'phabricator-tag-view-css' => 'f32a863a',
45284528
'phabricator-textareautils' => '75ccea43',
45294529
'phabricator-tooltip' => '75ccea43',
4530-
'phabricator-transaction-view-css' => 'c01cebae',
4531-
'phabricator-zindex-css' => 'c01cebae',
4532-
'phui-button-css' => 'c01cebae',
4533-
'phui-form-css' => 'c01cebae',
4534-
'phui-icon-view-css' => 'c01cebae',
4535-
'phui-spacing-css' => 'c01cebae',
4536-
'sprite-apps-large-css' => 'c01cebae',
4537-
'sprite-gradient-css' => 'c01cebae',
4538-
'sprite-icons-css' => 'c01cebae',
4539-
'sprite-menu-css' => 'c01cebae',
4540-
'syntax-highlighting-css' => 'c01cebae',
4530+
'phabricator-transaction-view-css' => 'f32a863a',
4531+
'phabricator-zindex-css' => 'f32a863a',
4532+
'phui-button-css' => 'f32a863a',
4533+
'phui-form-css' => 'f32a863a',
4534+
'phui-icon-view-css' => 'f32a863a',
4535+
'phui-spacing-css' => 'f32a863a',
4536+
'sprite-apps-large-css' => 'f32a863a',
4537+
'sprite-gradient-css' => 'f32a863a',
4538+
'sprite-icons-css' => 'f32a863a',
4539+
'sprite-menu-css' => 'f32a863a',
4540+
'syntax-highlighting-css' => 'f32a863a',
45414541
),
45424542
));

‎src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function processRequest() {
5151
if ($request->isFormPost()) {
5252
$v_question = $request->getStr('question');
5353
$v_description = $request->getStr('description');
54-
$v_responses = $request->getInt('responses');
54+
$v_responses = (int)$request->getInt('responses');
5555
$v_shuffle = (int)$request->getBool('shuffle');
5656

5757
if ($is_new) {

0 commit comments

Comments
 (0)
Failed to load comments.