zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

static profile wip

Browse Source
pull/12704/head
Carlos Matallín 7 years ago
parent c0654ba6dd
commit 46966f27aa
7 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
Gruntfile.js
Unescape View File

@ -244,6 +244,7 @@ module.exports = function (grunt) {
var builderFiles = [
'js_cartodb3',
'js_node_cartodb3',
'js_test_cartodb3'
];
var otherFiles = [
@ -328,6 +329,7 @@ module.exports = function (grunt) {
grunt.registerTask('js_builder', [
'copy:locale',
'copy:js_cartodb3',
'copy:js_node_cartodb3',
'copy:js_test_cartodb3'
]);

44
lib/assets/javascripts/cartodb/profile/views/pages_subheader.jst.ejs
Unescape View File

@ -1,45 +1,45 @@
<% if (!cdb.config.get('cartodb_com_hosted')) { %>
<a class='Filters-link' href='<%= planUrl %>/plan'>
<% if (!cdb.config.get("cartodb_com_hosted")) { %>
<a class="Filters-link" href="<%= planUrl %>">
<% } %>
<div class='SideMenu-progress'>
<div class='SideMenu-progressBar'>
<div class='progress-bar'>
<span class='bar-2 <%= progressBarClass %>' style='width: <%- usedDataPct %>%'></span>
<div class="SideMenu-progress">
<div class="SideMenu-progressBar">
<div class="progress-bar">
<span class="bar-2 <%= progressBarClass %>" style="width: <%- usedDataPct %>%"></span>
</div>
</div>
<span class='CDB-Text CDB-Size-medium u-altTextColor'><%= usedDataStr %> of <%= availableDataStr %></span>
<span class="CDB-Text CDB-Size-medium u-altTextColor"><%= usedDataStr %> of <%= availableDataStr %></span>
</div>
<span class='SideMenu-separator'></span>
<span class="SideMenu-separator"></span>
<% if (!cdb.config.get('cartodb_com_hosted')) { %>
<% if (!cdb.config.get("cartodb_com_hosted")) { %>
</a>
<% } %>
<div class='SideMenu-type'>
<ul class='SideMenu-list'>
<li class='SideMenu-typeItem'><a href='<%= profileUrl %>' class='SideMenu-typeLink <% if (window.location.pathname === profileUrl) { %>is-selected<% } %>'>Profile</a></li>
<li class='SideMenu-typeItem'><a href='<%= accountUrl %>' class='SideMenu-typeLink <% if (window.location.pathname === accountUrl) { %>is-selected<% } %>'>Account</a></li>
<li class='SideMenu-typeItem'><a href='<%= apiKeysUrl %>' class='SideMenu-typeLink <% if (window.location.pathname === apiKeysUrl) { %>is-selected<% } %>'>API keys</a></li>
<% if (!cdb.config.get('cartodb_com_hosted') && !isInsideOrg) { %>
<li class='SideMenu-typeItem'><a href='<%= planUrl %>/plan' class='SideMenu-typeLink <% if (window.location.pathname === profileUrl) { %>is-selected<% } %>'>Billing</a></li>
<div class="SideMenu-type">
<ul class="SideMenu-list">
<li class="SideMenu-typeItem"><a href="<%= profileUrl %>" class="SideMenu-typeLink <% if (window.location.pathname === profileUrl) { %>is-selected<% } %>">Profile</a></li>
<li class="SideMenu-typeItem"><a href="<%= accountUrl %>" class="SideMenu-typeLink <% if (window.location.pathname === accountUrl) { %>is-selected<% } %>">Account</a></li>
<li class="SideMenu-typeItem"><a href="<%= apiKeysUrl %>" class="SideMenu-typeLink <% if (window.location.pathname === apiKeysUrl) { %>is-selected<% } %>">API keys</a></li>
<% if (!cdb.config.get("cartodb_com_hosted") && !isInsideOrg) { %>
<li class="SideMenu-typeItem"><a href="<%= planUrl %>" class="SideMenu-typeLink">Billing</a></li>
<% } %>
<% if (isOrgAdmin) { %>
<li class='SideMenu-typeItem'><a href='<%= organizationUrl %>' class='SideMenu-typeLink <% if (window.location.pathname === organizationUrl) { %>is-selected<% } %>'>Organization settings</a></li>
<li class="SideMenu-typeItem"><a href="<%= organizationUrl %>" class="SideMenu-typeLink <% if (window.location.pathname === organizationUrl) { %>is-selected<% } %>">Organization settings</a></li>
<% } %>
</ul>
</div>
<div class='SideMenu-helpSegment CDB-Text CDB-Size-medium u-flex u-alignCenter'>
<div class='LayoutIcon LayoutIcon--darkGrey'>
<i class='CDB-IconFont CDB-IconFont-boss'></i>
<div class="SideMenu-helpSegment CDB-Text CDB-Size-medium u-flex u-alignCenter">
<div class="LayoutIcon LayoutIcon--darkGrey">
<i class="CDB-IconFont CDB-IconFont-boss"></i>
</div>
<div class='SideMenu-helpSegment--paragraph'>
<div class="SideMenu-helpSegment--paragraph">
<p>Having issues?</p>
<p>
<a href='mailto:<%= upgradeContactEmail %>'><% if (!isInsideOrg) { %>Contact support<% } else if (!isOrgOwner) { %>Contact your org. admin<% } else { %>Contact your VIP support<% } %></a>
<a href="mailto:<%= upgradeContactEmail %>"><% if (!isInsideOrg) { %>Contact support<% } else if (!isOrgOwner) { %>Contact your org. admin<% } else { %>Contact your VIP support<% } %></a>
</p>
</div>
</div>

2
lib/assets/test/spec/cartodb/dashboard/vendor_scripts_view.spec.js
Unescape View File

@ -1,6 +1,6 @@
var _ = require('underscore');
var cdb = require('cartodb.js-v3');
var VendorScriptsView = require('../../../../javascripts/cartodb/dashboard/vendor_scripts_view');
var VendorScriptsView = require('../../../../javascripts/cartodb/common/vendor_scripts_view');
var CONFIG = {
trackjs_customer: 'trackjs_customer',

3
lib/build/files/browserify_files.js
Unescape View File

@ -107,7 +107,8 @@ module.exports = {
'lib/assets/test/spec/cartodb/public_dashboard/**/*.spec.js',
'lib/assets/test/spec/cartodb/data_library/**/*.spec.js',
'lib/assets/test/spec/cartodb/feed/**/*.spec.js',
'lib/assets/test/spec/cartodb/explore/**/*.spec.js'
'lib/assets/test/spec/cartodb/explore/**/*.spec.js',
'lib/assets/test/spec/cartodb/profile/**/*.spec.js'
],
dest: '.grunt/browserify_modules_tests.js'
}

1
lib/build/files/js_files.js
Unescape View File

@ -195,6 +195,7 @@ var files = {
'!lib/assets/test/spec/cartodb/feed/**/*.js',
'!lib/assets/test/spec/cartodb/explore/**/*.js',
'!lib/assets/test/spec/cartodb/editor/**/*.js',
'!lib/assets/test/spec/cartodb/profile/**/*.js',
'.grunt/browserify_modules_tests.js'
],

18
lib/build/tasks/copy.js
Unescape View File

@ -170,7 +170,7 @@ exports.task = function (grunt) {
cwd: 'lib/assets/core/javascripts/cartodb/organization/',
src: ['**/*'],
dest: 'lib/assets/javascripts/cartodb/organization/'
} , {
}, {
expand: true,
cwd: 'lib/assets/client/javascripts/cartodb/organization/',
src: ['**/*'],
@ -182,8 +182,20 @@ exports.task = function (grunt) {
files: [{
expand: true,
cwd: 'lib/assets/core/javascripts/cartodb3/',
src: ['**/*'],
src: [
'**/*',
'!lib/assets/core/javascripts/cartodb3/carto-node/'
],
dest: 'lib/assets/javascripts/cartodb3/'
}]
},
js_node_cartodb3: {
files: [{
expand: true,
cwd: 'lib/assets/core/javascripts/cartodb3/carto-node/',
src: ['**/*'],
dest: 'lib/assets/javascripts/cartodb3/carto-node/'
}, {
expand: true,
cwd: 'lib/assets/client/javascripts/cartodb3/',
@ -198,7 +210,7 @@ exports.task = function (grunt) {
cwd: 'lib/assets/core/test/spec/cartodb3/',
src: ['**/*'],
dest: 'lib/assets/test/spec/cartodb3/'
} , {
}, {
expand: true,
cwd: 'lib/assets/client/test/spec/cartodb3/',
src: ['**/*'],

2
npm-shrinkwrap.json generated
Unescape View File

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.9.97",
"version": "4.9.97-12674.1",
"dependencies": {
"accessory": {
"version": "1.0.1",

Write Preview
Loading…
Cancel
Save