Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@driskull
driskull committed Sep 11, 2012
1 parent be1f3b0 commit a099229
Show file tree
Hide file tree
Showing 13 changed files with 280 additions and 661 deletions.
5 changes: 1 addition & 4 deletions SocialMedia/config/config.js
View file
@@ -1,14 +1,13 @@
{
"appid":"",
"webmap":"4ff792a3962547caad2d924413c40985",
"socialDistance":"regional",
"socialDisplay":"cluster",
"showFlickr":true,
"showFlickrConfig":true,
"flickrChecked":true,
"flickrSearch":"food",
"flickrRange":"this_week",
"flickrKey":"",
"flickrKey":"ce3afb039084d0c6456a2ff15be448e7",
"showYouTube":true,
"showYouTubeConfig":true,
"youtubeChecked":true,
Expand All @@ -30,7 +29,6 @@
"sharingurl":"http://www.arcgis.com/sharing/rest/content/items",
"portalUrl":"http://www.arcgis.com/",
"bingMapsKey":"",
"crosshairImage":"images/ui/crosshairblue.cur",
"defaultMenu":"social",
"showSearchBox":true,
"showShareMenu":true,
Expand All @@ -42,7 +40,6 @@
"showGeolocation":true,
"showAboutDialog":true,
"showAboutDialogOnLoad":false,
"socialPoint":"",
"locateName":"",
"locatePoint":"",
"sourceCountry":"USA"
Expand Down
47 changes: 1 addition & 46 deletions SocialMedia/css/application.css
View file
Expand Up @@ -408,7 +408,7 @@ background: -moz-linear-gradient(top, #f0f0f0 0%, #fefefe 100%);
border-radius: 2px;
}

.barButton .barIcon {
.barButton .barIcon, .inlineIcon {
display: inline-block;
vertical-align: text-bottom;
width: 16px;
Expand Down Expand Up @@ -1009,40 +1009,6 @@ background: -moz-linear-gradient(top, #bd362f 0%, #ee5f5b 100%);
text-align: center;
}

#settingsDialog .smallTxt {
font-size: 11px;
color: #666;
font-family: Arial, Helvetica, sans-serif;
}

.resetCenter {
display: inline-block;
display: none;
width: 16px;
height: 16px;
vertical-align: text-top;
z-index: 2;
overflow: hidden;
cursor: pointer;
background: url(../images/ui/uiSprite.png?v=3.01) no-repeat -32px 0px;
}

.locationButton {
margin-right: 10px;
}

.locationButton .iconBlock {
display: inline-block;
width: 15px;
height: 15px;
vertical-align: top;
background: url(../images/ui/uiSprite.png?v=3.01) no-repeat -384px 0px;
}

#socialUseCenter {
margin-left: 10px;
}

.socialIcon {
background: url(../images/ui/uiSprite.png?v=3.01) no-repeat -160px -16px;
}
Expand Down Expand Up @@ -1082,17 +1048,6 @@ background: -moz-linear-gradient(top, #bd362f 0%, #ee5f5b 100%);
margin-right: 10px;
}

.formStyle .sliderTxt {
font-size: 12px;
display: inline-block;
line-height: 16px;
padding: 4px 0;
}

.allOptions {
margin-top: 10px;
}

.twInfo {
display: inline-block;
height: 16px;
Expand Down
4 changes: 0 additions & 4 deletions SocialMedia/css/slider.css
View file
Expand Up @@ -43,10 +43,6 @@
width: 100px;
}

.modernGrey #socialSlider .dijitSliderBarContainerH {
width: 60px;
}

.modernGrey .dijitSliderBar {
border: 0;
outline: 0;
Expand Down
Binary file removed SocialMedia/images/ui/crosshairblue.cur
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions SocialMedia/index.html
View file
Expand Up @@ -18,8 +18,8 @@
<!-- End iOS -->
<!-- CSS -->
<link rel="stylesheet" type="text/css" href="css/reset.css" />
<link rel="stylesheet" type="text/css" href="http://serverapi.arcgisonline.com/jsapi/arcgis/3.2/js/esri/css/esri.css" />
<link rel="stylesheet" type="text/css" href="http://serverapi.arcgisonline.com/jsapi/arcgis/3.2/js/dojo/dojox/form/resources/Rating.css" />
<link rel="stylesheet" type="text/css" href="http://servicesbeta.esri.com/jsapi/arcgis/3.2/js/esri/css/esri.css" />
<link rel="stylesheet" type="text/css" href="http://serverapi.arcgisonline.com/jsapi/arcgis/3.0/js/dojo/dojox/form/resources/Rating.css" />
<link rel="stylesheet" type="text/css" href="css/application.css" />
<link rel="stylesheet" type="text/css" href="css/mediaQueries.css" />
<link rel="stylesheet" type="text/css" href="css/dialog.css" />
Expand All @@ -34,7 +34,7 @@
<!-- End CSS -->
<!-- JavaScript -->
<script type="text/javascript" src="js/djConfig.js"></script>
<script type="text/javascript" src="http://serverapi.arcgisonline.com/jsapi/arcgis/?v=3.2"></script>
<script type="text/javascript" src="http://serverapi.arcgisonline.com/jsapi/arcgis/?v=3.0"></script>
<script type="text/javascript" src="js/requires.js"></script>
<script type="text/javascript" src="js/plugins/respond.js"></script>
<script type="text/javascript" src="js/plugins/heatmap.js"></script>
Expand Down
41 changes: 1 addition & 40 deletions SocialMedia/js/application/common.js
View file
Expand Up @@ -75,7 +75,7 @@ function configUrlParams() {
// Set sharing links
function setSharing(isPreviewPage) {
// parameters to share
var urlParams = ['webmap', 'basemap', 'extent', 'locateName', 'layers', 'youtubeSearch', 'youtubeRange', 'youtubeChecked', 'twitterSearch', 'twitterChecked', 'flickrSearch', 'flickrRange', 'flickrChecked', 'socialDistance', 'socialPoint', 'socialDisplay', 'locatePoint'];
var urlParams = ['webmap', 'basemap', 'extent', 'locateName', 'layers', 'youtubeSearch', 'youtubeRange', 'youtubeChecked', 'twitterSearch', 'twitterChecked', 'flickrSearch', 'flickrRange', 'flickrChecked', 'socialDisplay', 'locatePoint'];
if (urlParams) {
configOptions.shareParams = '';
// for each parameter
Expand Down Expand Up @@ -160,31 +160,6 @@ function setDefaultConfigOptions() {
};
configOptions.previewPage = 'preview.html';
configOptions.homePage = 'index.html';
configOptions.socialSliderValues = [{
"label": i18n.viewer.distanceSlider.local,
"id": "local", // url param, don't localize
"values": {
"yt": 50,
"tw": 50,
"fl": 50
}
}, {
"label": i18n.viewer.distanceSlider.regional,
"id": "regional", // url param, don't localize
"values": {
"yt": 300,
"tw": 300,
"fl": 300
}
}, {
"label": i18n.viewer.distanceSlider.national,
"id": "national", // url param, don't localize
"values": {
"yt": 600,
"tw": 600,
"fl": 600
}
}];
configOptions.flickrID = "flickr";
configOptions.flickrTitle = i18n.viewer.flickr.title;
configOptions.flickrDescription = i18n.viewer.flickr.description;
Expand Down Expand Up @@ -215,11 +190,6 @@ function setDefaultConfigOptions() {
if (!configOptions.layerInfos) {
configOptions.layerInfos = [];
}
if (configOptions.socialPoint && typeof configOptions.socialPoint === 'string') {
configOptions.socialPoint = configOptions.socialPoint.split(',');
} else {
configOptions.socialPoint = [];
}
if (configOptions.layers && typeof configOptions.layers === 'string') {
configOptions.layers = configOptions.layers.split(',');
} else {
Expand All @@ -242,15 +212,6 @@ function setDefaultConfigOptions() {
dirNode.attr("dir", "ltr");
dirNode.addClass('esriLtr');
}
// socialDistance
configOptions.socialSliderCurrent = 1;
if (configOptions.socialSliderValues) {
for (var i = 0; i < configOptions.socialSliderValues.length; i++) {
if (configOptions.socialDistance.toLowerCase() === configOptions.socialSliderValues[i].id) {
configOptions.socialSliderCurrent = i;
}
}
}
}

// make sure config options are correct
Expand Down
6 changes: 5 additions & 1 deletion SocialMedia/js/application/main.js
View file
Expand Up @@ -616,9 +616,13 @@ function configureAboutText() {
draggable: true,
modal: false,
showTitle: true,
title: '<span class="aboutInfo"></span>' + i18n.viewer.about.title
title: i18n.viewer.about.title
};
configOptions.aboutDialog = new dijit.Dialog(props, dojo.byId('aboutDialog'));
node = dojo.query('#aboutDialog .dijitDialogTitle')[0];
if (node) {
node.innerHTML = '<span class="inlineIcon aboutInfo"></span>' + i18n.viewer.about.title;
}
if (configOptions.showAboutDialogOnLoad) {
configOptions.aboutDialog.show();
}
Expand Down

0 comments on commit a099229

Please sign in to comment.