Skip to content

Commit

Permalink
Merge branch 'tjhillard-master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@capfei
capfei committed Dec 18, 2015
2 parents 7134689 + a6c3f58 commit c868d78
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 60 deletions.
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ List of Microsoft Organizations on GitHub
- https://github.com/LIS
- https://github.com/Microsoft
- https://github.com/Microsoft-CISL
- https://github.com/MicrosoftEdge
- https://github.com/MicrosoftGenomics
- https://github.com/microsoft-hsg
- https://github.com/MicrosoftHPC
Expand All @@ -50,4 +51,4 @@ Note, if the Microsoft Open Source project you are looking for is not in one of
then we have several other projects hosted on CodePlex here:

- https://www.codeplex.com/site/users/view/MSOpenTech
- https://www.codeplex.com/site/users/view/Microsoft
- https://www.codeplex.com/site/users/view/Microsoft
15 changes: 10 additions & 5 deletions data/organization.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"url": "https://github.com/nuget",
"image": ""
}, {
"title": "Yammer",
"name": "yammer",
"url": "https://github.com/yammer",
"image": ""
}, {
"title": "Yammer",
"name": "yammer",
"url": "https://github.com/yammer",
"image": ""
}, {
"title": "WinJS",
"name": "winjs",
"url": "https://github.com/winjs",
Expand Down Expand Up @@ -128,4 +128,9 @@
"name": "MicrosoftGenomics",
"url": "https://github.com/MicrosoftGenomics",
"image": ""
}, {
"title": "Microsoft Edge",
"name": "MicrosoftEdge",
"url": "https://github.com/MicrosoftEdge",
"image": "https://avatars2.githubusercontent.com/u/11354582?v=3&s=200"
}]
64 changes: 24 additions & 40 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="row-fluid mscom-header-row-1" data-view4="2" data-view3="2" data-view2="2" data-view1="2" data-cols="2">
<div class="span bp1-col-2-1 bp2-col-2-1 bp3-col-2-1 bp0-col-2-1 mscom-header-section-1-1">
<a target="_self" class="mscom-link mscom-siteLogo mscom-siteLogo-small" title="Microsoft" href="http://www.microsoft.com" >
<img
<img
src="//c.s-microsoft.com/en-us/CMSImages/mslogo.png?version=856673f8-e6be-0476-6669-d5bf2300391d"
class="mscom-image mscom-left" alt="Microsoft" width="160" height="34">
</a>
Expand Down Expand Up @@ -148,9 +148,9 @@
<a class="right carousel-control" href="#carousel-featured-repos" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
</a>
</div>
</div>
</div>

<div class="all-projects">
<h3 ng-cloak>{{resultsSectionTitle}}</h3>
<div class="loading" ng-hide="main.projects">Loading data...</div>
Expand Down Expand Up @@ -184,7 +184,7 @@ <h3 ng-cloak>{{resultsSectionTitle}}</h3>
</div>
</div>
</div>

<div class="organizations">
<h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<div class="row">
Expand All @@ -193,7 +193,6 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<!-- <img ng-src="{{org.image}}" alt="{{org.image}}"> -->
<span class="text-center" ng-cloak>{{org.title}}</span>
</a>

</div>
</div>
</div>
Expand All @@ -208,11 +207,11 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<div>
<div class="CSPvNext CMSvNextComp mscom-footer-gray">
<div class="row-fluid mscom-footer-row-1 mscom-container-maxwidth mscom-grid-container" data-cols="4" data-view1="1" data-view2="2" data-view3="2" data-view4="4">
<span class="follow-text" style="margin-right: .5em;font-size: 18px;vertical-align:middle;">Follow Microsoft</span>
<a class="mscom-link social-icon-link" href="https://www.facebook.com/Microsoft" style="display: inline-block;margin-right: .5em;vertical-align: middle;">
<span class="follow-text" style="margin-right: .5em;font-size: 18px;vertical-align:middle;">Follow Open at Microsoft</span>
<a class="mscom-link social-icon-link" href="https://www.facebook.com/openatmicrosoft" style="display: inline-block;margin-right: .5em;vertical-align: middle;">
<img src="https://c.s-microsoft.com/en-us/CMSImages/HPFeb15_social_Facebook.png?version=7f2bd528-7148-5a76-d124-92ede5ee71c5" class="mscom-image social-icon" alt="Facebook" width="32" height="32" />
</a>
<a class="mscom-link social-icon-link" href="https://twitter.com/microsoft" style="display: inline-block;margin-right: .5em;vertical-align: middle;">
<a class="mscom-link social-icon-link" href="https://twitter.com/openatmicrosoft" style="display: inline-block;margin-right: .5em;vertical-align: middle;">
<img src="https://c.s-microsoft.com/en-us/CMSImages/HPFeb15_social_Twitter.png?version=6eb346b9-c834-c911-b448-1f01aa7d0201" class="mscom-image social-icon" alt="Twitter" width="32" height="32" />
</a>
</div>
Expand All @@ -231,11 +230,11 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
Blogs:
</li>
<li>
<a class="mscom-link"
href="http://msopentech.com/blog/" target="_self">Microsoft Open Technologies Blog</a>
<a class="mscom-link"
href="http://blogs.office.com/dev/" target="_self">Office Developer</a>
</li>
<li>
<a class="mscom-link"
<a class="mscom-link"
href="http://blogs.windows.com/buildingapps/" target="_self">Building Apps for Windows</a>
</li>
</ul>
Expand All @@ -256,18 +255,18 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
</li>
<li>
<a class="mscom-link"
href="http://blogs.office.com/dev/" target="_self">Office Developer</a>
</li>
<li>
href="https://blogs.windows.com/msedgedev/" target="_self">Microsoft Edge Dev Blog</a>
</li>
<li>
<a class="mscom-link"
href="http://blogs.msdn.com/b/bingdevcenter/" target="_self">Bing Dev Center Team Blog</a>
href="http://blogs.technet.com/b/serverandtools/" target="_self">Microsoft Cloud + Enterprise</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="span bp0-col-1-1 bp1-col-2-1 bp3-col-4-1 bp1-clear bp2-col-2-1 bp2-clear mscom-footer-destinationlink">
<div>
<div class="CSPvNext ">
Expand All @@ -280,16 +279,11 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
</li>
<li>
<a class="mscom-link"
href="http://blogs.technet.com/b/serverandtools/" target="_self">
Microsoft Cloud + Enterprise
</a>
href="http://blogs.msdn.com/b/bingdevcenter/" target="_self">Bing Dev Center Team Blog</a>
</li>
<li>
<a class="mscom-link"
href="http://blogs.msdn.com/b/ie/"
target="_self">
IEBlog
</a>
href="http://engineering.microsoft.com/" target="_self">Engineering @ Microsoft</a>
</li>
</ul>
</div>
Expand All @@ -306,13 +300,13 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<ul style="list-style-type: none;">
<li class="heading">
<span class="loc">
Contact us at:
Contact us:
</span>
</li>
<li>
<a class="mscom-link"
href="mailto:oss@microsoft.com"
target="_self">Open Source Program Office</a>
target="_self">Open Source Programs Office</a>
</li>
<li>
<a class="mscom-link"
Expand All @@ -330,7 +324,7 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<div class="span bp0-col-1-1 bp1-col-1-1 bp2-col-1-1 bp3-col-1-1 mscom-footer-defaultlink">
<div class="container">
<div class="row">
<div class="credits">This open sourced site is <a href="https://github.com/Microsoft/microsoft.github.io" target="_blank">hosted on GitHub</a>. Patches, suggestions and comments are welcome.
<div class="credits">This open sourced site is <a href="https://github.com/Microsoft/microsoft.github.io" target="_blank">hosted on GitHub</a>. Patches, suggestions and comments are welcome.
Built with love... and <a href="http://angularjs.org/" target="_blank">AngularJS</a>, <a href="http://getbootstrap.com/" target="_blank">Bootstrap</a>, <a href="http://pages.github.com/" target="_blank">GitHub Pages</a>, and <a href="http://developer.github.com/v3/" target="_blank">API</a>.</div>
</div>
</div>
Expand All @@ -343,23 +337,13 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<div class="row">
<div class="col-md-6" style="height:40px;position:relative;">
<div>
<div style="margin-bottom:3px;">
<a class="mscom-link msopentech-link" href="http://www.msopentech.com">
<span>Open Source Program Office</span>
</a>
</div>
<div>
<a class="mscom-link msopentech-link" href="http://www.msopentech.com">
<img src="img/MSOpenTech_logo.png" />
</a>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div>
<div>
<img class="mscom-image" alt="Microsoft" src="img/ms-footer.png" width="85" height="16">
<img class="mscom-image" alt="Microsoft" src="img/Microsoft_logo.png" width="85" height="16">
</div>
</div>
</div>
Expand All @@ -383,7 +367,7 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
<a class="mscom-link"
href="http://go.microsoft.com/?linkid=9851308" target="_self">Trademarks</a>
</li>
<li>&copy; 2015 Microsoft</li>
<li style="margin-left:25px;">&copy; <script>document.write(new Date().getFullYear());</script> Microsoft</li>
</ul>
</div>
</div>
Expand All @@ -393,12 +377,12 @@ <h3 class="orgs-heading">Other Microsoft GitHub Organizations</h3>
</div>
</div>
</footer>

<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.2/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.2/angular-aria.min.js"></script>
<script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.2.0.js"></script>
<script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.2.0.js"></script>
<script src="js/main.js"></script>
<script type="text/JavaScript">
var varSegmentation = 0;
Expand Down
28 changes: 14 additions & 14 deletions js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,32 @@ app.factory('Backend', ['$http',
return $http.get(url).then(function(resp) {
return resp.data;
});
}
};
};

return {
featured: get('data/featured.json'),
orgs: get('data/organization.json')
}
};
}
])

.controller('MainCtrl', ['Backend', '$scope', 'filterFilter', '$anchorScroll',
function(Backend, $scope, filterFilter, $anchorScroll) {
var self = this;

Backend.orgs().then(function(data) {
self.orgs = data;
});

Backend.featured().then(function(data) {
self.featured = data;

$.ajax({
url: 'https://popularrepostg.blob.core.windows.net/popularrepos/projects.json',
dataType: 'jsonp',
jsonpCallback: 'JSON_CALLBACK',
success: function(data) {
success: function(data) {
var projects = data[0].AllProjects;
$scope.currentPage = 1; //current page
$scope.maxSize = 5; //pagination max size
Expand All @@ -50,11 +51,11 @@ app.factory('Backend', ['$http',
$scope.filtered = filterFilter(projects, term);
$scope.noOfRepos = $scope.filtered.length;
$scope.noOfPages = Math.ceil($scope.noOfRepos / $scope.entryLimit);
$scope.resultsSectionTitle = (!term) ? 'All Repos' : (($scope.noOfRepos == 0) ? 'Search results' : ($scope.noOfRepos + ' repositories found'));
$scope.resultsSectionTitle = (!term) ? 'All Repos' : (($scope.noOfRepos === 0) ? 'Search results' : ($scope.noOfRepos + ' repositories found'));
});

var featuredProjects = new Array();

self.featured.forEach(function (name) {
for (var i = 0; i < projects.length; i++) {
var project = projects[i];
Expand All @@ -64,7 +65,7 @@ app.factory('Backend', ['$http',
}
}
});

self.projects = projects;
self.featuredProjects = featuredProjects;
$scope.$apply();
Expand All @@ -75,11 +76,11 @@ app.factory('Backend', ['$http',
dataType: 'jsonp',
jsonpCallback: 'JSON_CALLBACK',
success: function (stats) {
if (stats != null) {
if (stats !== null) {
$scope.overAllStats = stats[0];
}
}
})
});
});
}
])
Expand All @@ -90,6 +91,5 @@ app.factory('Backend', ['$http',
return input.slice(start);
}
return [];
}
});

};
});

0 comments on commit c868d78

Please sign in to comment.