Page MenuHomestyx hydra

No OneTemporary

diff --git a/src/applications/metamta/contentsource/source/PhabricatorContentSource.php b/src/applications/metamta/contentsource/source/PhabricatorContentSource.php
index e058dfdb1d..c190df5e8e 100644
--- a/src/applications/metamta/contentsource/source/PhabricatorContentSource.php
+++ b/src/applications/metamta/contentsource/source/PhabricatorContentSource.php
@@ -1,75 +1,76 @@
<?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
final class PhabricatorContentSource {
const SOURCE_UNKNOWN = 'unknown';
const SOURCE_WEB = 'web';
const SOURCE_EMAIL = 'email';
const SOURCE_CONDUIT = 'conduit';
const SOURCE_MOBILE = 'mobile';
const SOURCE_TABLET = 'tablet';
+ const SOURCE_FAX = 'fax';
private $source;
private $params = array();
private function __construct() {
// <empty>
}
public static function newForSource($source, array $params) {
$obj = new PhabricatorContentSource();
$obj->source = $source;
$obj->params = $params;
return $obj;
}
public static function newFromSerialized($serialized) {
$dict = json_decode($serialized, true);
if (!is_array($dict)) {
$dict = array();
}
$obj = new PhabricatorContentSource();
$obj->source = idx($dict, 'source', self::SOURCE_UNKNOWN);
$obj->params = idx($dict, 'params', array());
return $obj;
}
public function serialize() {
return json_encode(array(
'source' => $this->getSource(),
'params' => $this->getParams(),
));
}
public function getSource() {
return $this->source;
}
public function getParams() {
return $this->params;
}
public function getParam($key, $default = null) {
return idx($this->params, $key, $default);
}
}
diff --git a/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php b/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php
index 5018b27eb8..5ad1f0d297 100644
--- a/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php
+++ b/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php
@@ -1,61 +1,62 @@
<?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
final class PhabricatorContentSourceView extends AphrontView {
private $contentSource;
private $user;
public function setContentSource(PhabricatorContentSource $content_source) {
$this->contentSource = $content_source;
return $this;
}
public function setUser(PhabricatorUser $user) {
$this->user = $user;
return $this;
}
public function render() {
require_celerity_resource('phabricator-content-source-view-css');
$map = array(
PhabricatorContentSource::SOURCE_WEB => 'Web',
PhabricatorContentSource::SOURCE_CONDUIT => 'Conduit',
PhabricatorContentSource::SOURCE_EMAIL => 'Email',
PhabricatorContentSource::SOURCE_MOBILE => 'Mobile',
PhabricatorContentSource::SOURCE_TABLET => 'Tablet',
+ PhabricatorContentSource::SOURCE_FAX => 'Fax',
);
$source = $this->contentSource->getSource();
$type = idx($map, $source, null);
if (!$type) {
return;
}
return phutil_render_tag(
'span',
array(
'class' => "phabricator-content-source-view",
),
"Via {$type}");
}
}
diff --git a/webroot/rsrc/image/icon/fatcow/README b/webroot/rsrc/image/icon/fatcow/README
index 5d3ea5ed31..c294834741 100644
--- a/webroot/rsrc/image/icon/fatcow/README
+++ b/webroot/rsrc/image/icon/fatcow/README
@@ -1,16 +1,17 @@
These icons come from the FatCow icon set:
http://www.fatcow.com/free-icons
They are available under the Creative Commons Attribution 3.0 License:
http://creativecommons.org/licenses/by/3.0/us/
Some icons have been adapted from the FatCow set for use in Phabricator:
key_question.png (from key_*.png)
source/web.png (from world.png)
source/email.png (from email.png)
source/conduit.png (from satellite_dish.png)
source/mobile.png (from phone.png)
- source/tablet.png (from tablet.png)
\ No newline at end of file
+ source/tablet.png (from tablet.png)
+ source/fax.png (from fax.png)
\ No newline at end of file
diff --git a/webroot/rsrc/image/icon/fatcow/source/fax.png b/webroot/rsrc/image/icon/fatcow/source/fax.png
new file mode 100644
index 0000000000..399c895aaa
Binary files /dev/null and b/webroot/rsrc/image/icon/fatcow/source/fax.png differ

File Metadata

Mime Type
text/x-diff
Expires
Sun, Jul 27, 5:54 PM (1 w, 7 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
186057
Default Alt Text
(5 KB)

Event Timeline