Skip to content

Commit f3fd7e5

Browse files
williamsteinwilliamstein
authored
Merge pull request #7972 from sagemathinc/rm-load-html-take-2
remove html-minify-loader // take 2
2 parents 9d213e1 + d90b2ee commit f3fd7e5

File tree

11 files changed

+417
-703
lines changed

11 files changed

+417
-703
lines changed

‎src/packages/frontend/account.html

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/packages/frontend/console.html

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎src/packages/frontend/editor.html renamed to ‎src/packages/frontend/editor-templates.ts

Lines changed: 266 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,102 @@
1-
<!--
2-
This file is part of CoCalc: Copyright © 2020 Sagemath, Inc.
3-
License: MS-RSL – see LICENSE.md for details
4-
-->
1+
/*
2+
* This file is part of CoCalc: Copyright © 2024 Sagemath, Inc.
3+
* License: MS-RSL – see LICENSE.md for details
4+
*/
55

6+
const console = `
7+
<div id="webapp-console-templates" class="hide">
8+
<div class="webapp-console smc-vfill webapp-console-blur">
9+
10+
<!-- The bar across the top -->
11+
<!-- increase font, decrease font, refresh, paste spot, then title ... font indicator-->
12+
<div class="webapp-console-topbar">
13+
<div class="smc-users-viewing-document webapp-editor-chat-title">
14+
<!--to be filled with react component for users viewing the document-->
15+
</div>
16+
17+
&nbsp;&nbsp;
18+
19+
<div class="pull-left">
20+
<span class="btn-group visible-xs">
21+
<a href="#decrease-font" class="btn btn-default"><i class="fa fa-font" style="font-size:8pt"> </i> </a>
22+
<a href="#increase-font" class="btn btn-default"><i class="fa fa-font" style="font-size:13pt"> </i></a>
23+
<a href="#refresh" class='btn btn-default'><i class="fa fa-repeat" style="font-size:14pt"> </i></a>
24+
</span>
25+
26+
<span class="hidden-xs">
27+
<span class="btn-group">
28+
<a href="#decrease-font" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Smaller"><i class="fa fa-font" style="font-size:7pt"> </i> </a>
29+
<a href="#increase-font" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Bigger"><i class="fa fa-font" style="font-size:10pt"> </i> </a>
30+
<a href="#refresh" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Reconnect"><i class="fa fa-repeat"> </i> </a>
31+
<a href="#pause" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Pause"><i class="fa fa-pause"> </i> </a>
32+
<a href="#paste" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="History"><i class="fa fa-paste"> </i> </a>
33+
<a href="#initfile" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Init file"><i class="fa fa-rocket"> </i> </a>
34+
<a href="#boot" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Boot others"><i class="fa fa-sign-out-alt"> </i> </a>
35+
36+
</span>
37+
&nbsp;&nbsp;
38+
<span>
39+
<span class="webapp-console-font-indicator hide"><i class="fa fa-font"> </i>
40+
<span class="webapp-console-font-indicator-size"></span>pt
41+
<a class="btn btn-success btn-sm" href="#font-make-default">make default</a>
42+
</span>
43+
</span>
44+
</span>
45+
</div>
46+
47+
<div class="webapp-console-title pull-left"></div>
48+
&nbsp;&nbsp;
49+
<div class="pull-right webapp-burst-indicator hide" style="background: red;color: white; padding: 5px 15px;
50+
font-weight: bold;">
51+
WARNING: Large burst of output! (May try to interrupt.)
52+
</div>
53+
54+
<div class="webapp-console-mobile-input">
55+
56+
<input class="webapp-console-input-line form-control" type="text" style="width:98%" placeholder="Type input or paste here...">
57+
<span class="btn-group">
58+
<a class="btn webapp-console-submit-esc btn-default">esc</a>
59+
<a class="btn webapp-console-submit-line btn-default">return</a>
60+
<a class="btn webapp-console-submit-submit btn-default">submit</a>
61+
<a class="btn webapp-console-submit-ctrl-b btn-default">ctrl-b</a>
62+
<a class="btn webapp-console-submit-ctrl-c btn-default">ctrl-c</a>
63+
<a class="btn webapp-console-submit-tab btn-default">tab</a>
64+
<a class="btn webapp-console-submit-up btn-default"><i class="fa fa-arrow-up"></i></a>
65+
<a class="btn webapp-console-submit-down btn-default"><i class="fa fa-arrow-down"></i></a>
66+
<a class="btn webapp-console-submit-left btn-default"><i class="fa fa-arrow-left"></i></a>
67+
<a class="btn webapp-console-submit-right btn-default"><i class="fa fa-arrow-right"></i></a>
68+
</span>
69+
</div>
70+
71+
<textarea class="webapp-console-textarea"></textarea>
72+
<!--
73+
<a class="btn btn-info webapp-console-esc hide">esc</a>
74+
<a class="btn btn-info webapp-console-tab hide">tab</a>
75+
<a class="btn btn-info webapp-console-control hide">control</a>
76+
<a class="btn webapp-console-up"><i class="fa fa-arrow-up"></i></a>
77+
<a class="btn webapp-console-down"><i class="fa fa-arrow-down"></i></a>
78+
-->
79+
</div>
80+
81+
<!-- The actual terminal -->
82+
<!-- I tried autocomplete="false" in the textarea, but this is not valid HTML, and I think didn't work anyways.
83+
Jason Grout suggests: autocapitalize="off" autocorrect="off" autocomplete="off"
84+
-->
85+
<div class="smc-vfill" style="position:relative">
86+
<textarea class="webapp-console-for-mobile hide"></textarea>
87+
<div style="flex:1; display:flex; overflow:hidden" class="webapp-console-terminal-container">
88+
<div style="flex:1; position:relative">
89+
<div class="smc-vfill webapp-console-terminal"></div>
90+
</div>
91+
<div class="webapp-console-scrollbar"></div>
92+
</div>
93+
</div>
94+
</div>
95+
</div>
96+
97+
`;
98+
99+
const editor = `
6100
<div id="webapp-editor-templates" class="hide">
7101
<!-- Template for the entire editor, both tabs and the actual content -->
8102
<div class="webapp-editor">
@@ -1555,3 +1649,171 @@ <h3><i class="fa fa-bolt"> </i> Goto Line</h3>
15551649
</div>
15561650
</div>
15571651
</div>
1652+
1653+
`;
1654+
1655+
const sagews_interact = `
1656+
<div class="webapp-interact-templates hide">
1657+
1658+
<!-- Interact -->
1659+
<div class="webapp-interact-container container-fluid">
1660+
</div>
1661+
1662+
<!-- Interact: input-box -->
1663+
<div class="webapp-interact-control-input-box">
1664+
<div class="row">
1665+
<div class="col-sm-4">
1666+
<span class="webapp-interact-label pull-right"></span>
1667+
</div>
1668+
<div class="col-sm-8">
1669+
<input type="text" class="hide webapp-interact-input-box-font form-control">
1670+
<textarea class="hide webapp-interact-input-box-font" spellcheck="false"></textarea>
1671+
<span class="webapp-interact-control-input-box-submit-button hide">
1672+
<a class="btn btn-default">Submit</a>
1673+
<br><br>
1674+
</span>
1675+
</div>
1676+
</div>
1677+
</div>
1678+
1679+
1680+
<!-- Interact: checkbox -->
1681+
<div class="webapp-interact-control-checkbox">
1682+
<div class="row">
1683+
<div class="col-sm-4">
1684+
<span class="webapp-interact-label pull-right" style=" padding-top: 2px;"></span>
1685+
</div>
1686+
<div class="col-sm-8">
1687+
<input type="checkbox">
1688+
</div>
1689+
</div>
1690+
</div>
1691+
1692+
<!-- Interact: selector -->
1693+
<div class="webapp-interact-control-selector">
1694+
<div class="row">
1695+
<div class="col-sm-4">
1696+
<span class="webapp-interact-label pull-right"></span>
1697+
</div>
1698+
<div class="col-sm-8">
1699+
<div class="webapp-interact-control-content"></div>
1700+
</div>
1701+
</div>
1702+
</div>
1703+
1704+
<!-- Interact: button -->
1705+
<div class="webapp-interact-control-button">
1706+
<div class="row">
1707+
<div class="col-sm-4">
1708+
<span class="webapp-interact-label pull-right"></span>
1709+
</div>
1710+
<div class="col-sm-8">
1711+
<a class="btn btn-default"><i class="fa">&nbsp;&nbsp;</i> <span></span></a>
1712+
</div>
1713+
</div>
1714+
</div>
1715+
1716+
<!-- Interact: text -->
1717+
<div class="webapp-interact-control-text">
1718+
<div class="row">
1719+
<div class="col-sm-4">
1720+
<span class="webapp-interact-label pull-right"></span>
1721+
</div>
1722+
<div class="col-sm-8">
1723+
<span class="webapp-interact-control-content"></span>
1724+
</div>
1725+
</div>
1726+
</div>
1727+
1728+
<!-- Interact: color-selector -->
1729+
<div class="webapp-interact-control-color-selector">
1730+
<div class="row">
1731+
<div class="col-sm-4">
1732+
<span class="webapp-interact-label pull-right"></span>
1733+
</div>
1734+
<div class="col-sm-8">
1735+
<div class="input-group color" data-color-format="rgb">
1736+
<input type="text" value="" style="font-family:monospace" class="form-control">
1737+
<span class="input-group-addon"><i class="fa" style="height: 16px; width: 16px"></i></span>
1738+
</div>
1739+
</div>
1740+
</div>
1741+
</div>
1742+
1743+
<!-- Interact: slider -->
1744+
<div class="webapp-interact-control-slider">
1745+
<div class=" webapp-interact-control-content">
1746+
<div class="row">
1747+
<div class="col-sm-4">
1748+
<div class="webapp-interact-label pull-right"></div>
1749+
</div>
1750+
<div class="pull-left col-sm-6">
1751+
<div class="webapp-interact-control-slider"></div>
1752+
</div>
1753+
<div class="col-sm-2">
1754+
<div class="webapp-interact-control-value"></div>
1755+
</div>
1756+
</div>
1757+
</div>
1758+
</div>
1759+
1760+
1761+
<!-- Interact: range-slider -->
1762+
<div class="webapp-interact-control-range-slider">
1763+
<div class="webapp-interact-control-content">
1764+
<div class="row">
1765+
<div class="col-sm-4">
1766+
<div class="webapp-interact-label pull-right"></div>
1767+
</div>
1768+
<div class="pull-left col-sm-6">
1769+
<div class="webapp-interact-control-slider"></div>
1770+
</div>
1771+
<div class="col-sm-2">
1772+
<div class="webapp-interact-control-value"></div>
1773+
</div>
1774+
</div>
1775+
</div>
1776+
</div>
1777+
1778+
<!-- Interact: input_grid -->
1779+
<div class="webapp-interact-control-input-grid">
1780+
<div class="row">
1781+
<div class="col-sm-4">
1782+
<span class="webapp-interact-label pull-right"></span>
1783+
</div>
1784+
<div class="col-sm-8">
1785+
<span class="webapp-interact-control-grid well"></span>
1786+
<a class="btn btn-success btn-sm"><i class="fa fa-check"> </i><span></span></a>
1787+
</div>
1788+
</div>
1789+
</div>
1790+
1791+
</div>
1792+
`;
1793+
1794+
const sagews_3d = `
1795+
<div class="webapp-3d-templates hide">
1796+
<span class="webapp-3d-loading">
1797+
<i class="fa fa-cube fa-spin" style="font-size:16pt"></i>
1798+
Loading 3D scene...
1799+
</span>
1800+
<span class="webapp-3d-viewer">
1801+
<span class="webapp-3d-note hide">
1802+
Evaluate to see 3d plot.
1803+
</span>
1804+
<span class="webapp-3d-canvas">
1805+
</span>
1806+
<span class="webapp-3d-canvas-warning lighten hide" style="margin-top: -1em" data-toggle="tooltip" data-placement="top" title="WARNING: using slow non-WebGL canvas renderer">canvas</span>
1807+
</span>
1808+
</div>
1809+
`;
1810+
1811+
const sagews_d3 = `
1812+
<div class="webapp-d3-templates hide">
1813+
<span class="webapp-d3-graph-viewer">
1814+
</span>
1815+
</div>
1816+
`;
1817+
1818+
export const TEMPLATES_HTML =
1819+
console + editor + sagews_interact + sagews_3d + sagews_d3;

‎src/packages/frontend/editor.coffee

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ $ = window.$
77

88
# Do this first, before any templates are initialized (e.g., elsewhere too).
99

10-
templates_html = \
11-
require("./console.html").default +
12-
require("./editor.html").default +
13-
require("./sagews/interact.html").default +
14-
require("./sagews/3d.html").default +
15-
require("./sagews/d3.html").default;
16-
$("body").append(templates_html);
10+
{TEMPLATES_HTML} = require("./editor-templates")
11+
12+
$("body").append(TEMPLATES_HTML);
1713

1814
templates = $("#webapp-editor-templates")
1915

0 commit comments

Comments
 (0)