add link to OffsetStabilizer

Replace download button with windows icon (just four squares).
Make the download button last so on certain screens it wouldn't cause additional empty-ish lines.
Redo the wording so the button is shorter, but the dropdown menu is filled.

Signed-off-by: Egor Savkin <es@m-labs.hk>

content/about-us/faq.md

@@ -0,0 +1,112 @@
++++
+title = "FAQ"
+weight = 3
+template = "page.html"
++++
+
+##### Why are you in Hong Kong?
+
+Low taxes, efficient infrastructure, no import/export fees and red tape for most products including high-tech items, good quality of life. 
+
+##### Why are you in Manila?
+
+For the convenience of our customers who may be discouraged from doing business with companies registered in Hong Kong.
+
+##### Where will my Sinara order be manufactured and where will it ship from?
+
+M-Labs can manufacture Sinara hardware orders in Hong Kong, or, upon request, in Manila, Philippines. Additional fees, minimum quantities, and/or extended lead times may apply to orders to be made in the Philippines. Shipping is from the manufacturing place.
+
+##### Do I need to pay additional import fees?
+
+M-Labs ships orders according to FCA or DAP terms as defined by the International Commercial Terms (Incoterms<sup>®</sup>) published by the International Chamber of Commerce, edition 2020.
+
+According to these terms, you are responsible for resolving problems created by customs at the destination country or territory, at your own expense.
+
+If you are a credit customer (eligible for Net 15 or Net 30 payment), upon your request and for your convenience, we may ask UPS to deal with customs on your behalf and we will add the fees to your final invoice.
+
+Import fees are determined by customs at the time of import in the destination country or territory, and are outside our control.
+
+##### My institution cannot import your products. Do you have a distributor in my country?
+
+Typical countries where this situation happens and suitable distributor contacts are as follows:
+
+ * China (mainland): kitty-zheng@kehua-trade.com
+ * Japan: hishida@symphotony.com or h_yamamoto@autex-inc.co.jp
+ * India: sale.sannidhi@gmail.com
+ * Thailand: info@irct.co.th or thayika@ryts-instruments.co.th
+
+You are responsible for paying distributor fees and we do not grant discounts on the basis of requiring a distributor. On our side, we do not mandate the use of any distributor and we can ship directly to you or via another distributor of your choosing not listed here. Generally, you may solve the import problems created by customs and other bureaucracy in any way that you deem acceptable.
+
+##### How will my order be shipped?
+
+M-Labs ships with UPS by default, and we also offer FedEx or DHL shipping for an additional fee. We can ship on your courier account and you may also arrange your own pickup and shipping. For orders exceeding USD 200.00, there is no handling fee.
+
+##### Can I have a discount?
+
+M-Labs offers discounts in the following cases:
+ * 10% discount plus free DAP shipping if the research supported by our equipment is made public and exclusively published in a non-predatory scientific journal. A non-predatory journal is defined as an open access journal with an article processing fee of USD 500.00 or less.
+ * Volume discounts (applies to new orders and not retroactively, volume is determined over the 365 days prior to the new order, the new order is included in the amount compared against the threshold):
+   - 2% discount with an order volume exceeding USD 100,000.00.
+   - 4% discount with an order volume exceeding USD 250,000.00.
+ * Use of our equipment exclusively in jurisdictions outside the World Bank's "High Income" group, and where the R&D expenditure is less than 2% of GDP as determined by the World Bank, and which do not possess nuclear weapons.
+ * Equipment with cosmetic or other minor damage - please enquire.
+ * Advanced hobbyist and amateur use. Please describe your project when applying for the discount and provide supporting evidence (e.g. publications of past projects, personal website, copy of amateur radio license, ...).
+ 
+ We reserve the right of final decision regarding discount eligibility and amount.
+
+##### I am on a really tight budget, what can I do?
+
+You can build a useful ARTIQ system and spend very little money by running the open-source code on mass-produced low-cost electronics that were not made for this purpose. For example, in theory the [Colorlight-75E](https://hackaday.com/2020/01/24/new-part-day-led-driver-is-fpga-dev-board-in-disguise/) and [EBAZ4205](https://github.com/xjtuecho/EBAZ4205) can be used as core devices, and the Taobao shop [ZONRI](https://world.taobao.com/dianpu/73267337.htm) sells many inexpensive boards that can be useful as I/O peripherals such as DDS and data converters.
+
+This is not a turn-key solution; experience with electronics, FPGA, and software development is required, and you will have to spend some time studying the code, porting it to these boards, writing drivers, and building hardware adapters.
+
+See also [193THz.com](https://193THz.com) for ideas about low-cost homebrew laser systems.
+
+##### Do you have a warranty?
+
+For most products, we offer a 1-year warranty against manufacturing defects.
+
+##### What should I do if I need technical support, or there is a problem with my order?
+
+Please contact us at helpdesk@m-labs.hk.
+
+If you have contacted the helpdesk and your issue cannot be satisfactorily resolved, then contact sb@m-labs.hk or text +852 65873703. Mention your helpdesk ticket number. 
+
+##### What are your payment terms?
+
+For most established institutions (determined at our discretion), we offer Net 15 and Net 30 terms after delivery. Please enquire from your institutional email address to help us determine your eligibility for these terms.
+
+For all others, payment is due 100% in advance before shipment.
+
+Letters of credit are not an option.
+ 
+##### What currency can I pay in?
+
+We accept all major currencies including USD, EUR, RMB, GBP, BTC and XMR.
+
+##### Can I pay by credit card?
+
+Yes, however processing credit cards is expensive and you need to cover the costs. 4\% card processing fee applies for payment by credit card in Hong Kong dollars. 7\% card processing and exchange fee applies for payment by credit card in US dollars.
+ 
+##### We are a distributor. Can we have exclusive rights to your products?
+
+Exclusivity is subject to contractual minimum order volumes determined at our discretion, but generally exceeding USD 300,000.00 per year for most countries.
+
+##### What is m-labs-intl.com?
+
+[m-labs-intl.com](https://m-labs-intl.com) is a mirror site operated by us and hosted in the USA by Hetzner. It is useful in situations where your institution or local authorities block access to Hong Kong websites (.hk domains and/or Hong Kong IP addresses). To our knowledge, no internet blocking is done on the Hong Kong side other than through ISP DNS resolvers, which we do not use and which does not affect your access to our website.
+
+Some features are currently not available on the mirror site, and you may use a VPN or another circumvention measure of your choice to access these as required.
+
+##### Why are you ignoring my emails?
+
+If you are using the email server of a large institution, be aware that some may silently drop emails sent to .hk email addresses and/or to servers located in Hong Kong.
+
+Try sending your message from your personal address (for example Gmail, Outlook and Yahoo do not block our email system), or to the same email address at the m-labs-intl.com domain (for example, sales@m-labs-intl.com or sb@m-labs-intl.com).
+
+Alternatively, you may use our [contact phone numbers](../office/), which are also registered with several popular messaging apps.
+
+##### We are a recruitment firm. Can we help you find talent?
+ 
+No.
+

content/experiment-control/resources.md

@@ -170,13 +170,6 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 <a href="https://github.com/cnourshargh/Bham-ARTIQ-examples" target="_blank" rel="noopener noreferrer">Repository</a>
 {% end %}
 
-
-{% layout_card(title="Deltaflow-on-ARTIQ", sameheight=120) %}
-<small>Run programs in the Deltaflow language from Riverlane on simulated ARTIQ</small>
-
-<a href="https://github.com/riverlane/deltaflow-on-artiq" target="_blank" rel="noopener noreferrer">Repository</a>
-{% end %}
-
 {% layout_card(title="DAX - Duke ARTIQ extensions", sameheight=120) %}
 <small>A library to provide tools for system organization/abstraction and to improve usability by automating common functionality.</small>
 
@@ -234,6 +227,12 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 <a href="https://github.com/vuthalab/artiq" target="_blank" rel="noopener noreferrer">Repository</a>
 {% end %}
 
+{% layout_card(title="OffsetStabilizer", sameheight=120) %}
+<small>Stabilizer firmware for laser frequency offset stabilization</small>
+
+<a href="https://github.com/PhBrb/OffsetStabilizer" target="_blank" rel="noopener noreferrer">Repository</a>
+{% end %}
+
 </div>
 
 {% layout_div(css="col-12 text-center") %}

content/experiment-control/sinara-core.md

@@ -270,6 +270,7 @@ The 4624 AWG "Phaser" is a quad channel 1.25 GS/s RF generator card with dual IQ
 
 - 2x 1.25 GS/s IQ upconverters.
 - dual IQ mixer + 0.3 GHz to 4.8 GHz VCO + PLL.
+- up to 16 dynamic tones per channel using <a href="https://github.com/quartiq/miqro-sim" target="_blank" rel="noopener noreferrer">MIQRO gateware</a> (available separately from QUARTIQ).
 - 31.5 dB range digital step attenuator (similar to Urukul).
 - 2 channels of 5 MS/s ADC (similar to Sampler).
 - Artix-7 FPGA.
@@ -297,7 +298,7 @@ The 4624 AWG "Phaser" is a quad channel 1.25 GS/s RF generator card with dual IQ
 
 We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. The lead time can be as short as a few working days and we will provide assistance to help you set up your new equipment with ARTIQ via the online helpdesk. Using our AFWS tool, you can keep the firmware of your M-Labs devices up-to-date easily, and benefit from the new features we continuously develop into ARTIQ.
 
-Use our [web-based configuration and ordering tool](../place-order), or contact <{{ email(address="sales") }} with your requirements, and we will establish a quote.
+Use our [web-based configuration and ordering tool](../place-order), or contact {{ email(address="sales") }} with your requirements, and we will establish a quote.
 
 {% end %}
 

package.json

@@ -14,39 +14,42 @@
     "type": "git",
     "url": "https://git.m-labs.hk/M-Labs/web2019.git"
   },
+  "dependencies": {
+    "@hello-pangea/dnd": "^16.6.0",
+    "bootstrap": "^5.3.3",
+    "json-logic-js": "^2.0.5",
+    "react": "^18.3.1",
+    "react-bootstrap": "^2.10.4",
+    "uuid": "^9.0.1",
+    "zustand": "^4.5.4"
+  },
   "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@babel/preset-react": "^7.23.3",
+    "@babel/cli": "^7.24.8",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/preset-react": "^7.24.7",
+    "@uidotdev/usehooks": "^2.4.1",
     "babel-loader": "^9.1.3",
     "babel-preset-minify": "^0.5.2",
-    "bootstrap": "^5.3.3",
-    "jquery": "^3.7.1",
-    "react": "^18.2.0",
-    "react-bootstrap": "^2.10.2",
-    "@hello-pangea/dnd": "^16.5.0",
-    "react-dom": "^18.2.0",
-    "uuid": "^9.0.1",
-    "webpack": "^5.90.3",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
-    "json-logic-js": "^2.0.2",
-    "zustand": "^4.5.2",
-    "@uidotdev/usehooks":"^2.4.1",
     "webpack-preprocessor-loader": "^1.3.0"
   },
   "babel": {
     "presets": [
       "@babel/preset-react",
-      ["@babel/preset-env", {
-        "targets": {
-          "browsers": [
-            ">0.25%",
-            "not dead",
-            "not op_mini all"
-          ]
+      [
+        "@babel/preset-env",
+        {
+          "targets": {
+            "browsers": [
+              ">0.25%",
+              "not dead",
+              "not op_mini all"
+            ]
+          }
         }
-      }]
+      ]
     ]
   }
 }

sass/css/_base.scss

@@ -90,28 +90,52 @@ a {
   }
 }
 
-.navbar-light .navbar-nav .nav-link,
-.dropdown-item {
-  outline: none;
-  color: $color-primary;
-  text-decoration: none;
-
-  &:visited {
+.navbar {
+  .navbar-light .navbar-nav .nav-link,
+  .dropdown-item {
+    outline: none;
     color: $color-primary;
+    text-decoration: none;
+
+    &:visited {
+      color: $color-primary;
+    }
+
+    &:hover {
+      color: $color-secondary;
+    }
   }
 
-  &:hover {
+  .navbar-light .navbar-nav .active>.nav-link,
+  .navbar-light .navbar-nav .nav-link.active,
+  .navbar-light .navbar-nav .nav-link.show,
+  .navbar-light .navbar-nav .show>.nav-link {
     color: $color-secondary;
   }
-}
 
-.navbar-light .navbar-nav .active>.nav-link,
-.navbar-light .navbar-nav .nav-link.active,
-.navbar-light .navbar-nav .nav-link.show,
-.navbar-light .navbar-nav .show>.nav-link {
-  color: $color-secondary;
-}
+  .dropdown-menu {
+    border: none;
+  }
+  .dropdown-item {
+    &:hover,
+    &:active {
+      background-color: transparent;
+    }
+  }
+  .dropdown-item.active {
+    color: $color-secondary;
+    background-color: transparent;
+  }
 
+  .navbar-toggler {
+    outline: none;
+
+    &:focus,
+    &:hover {
+      outline: none;
+    }
+  }
+}
 
 
 /**
@@ -127,22 +151,6 @@ a {
   border: 1px solid transparent;
 }
 
-.dropdown-menu {
-  border: none;
-  margin-top: 0;
-  padding-top: 0;
-}
-.dropdown-item {
-  &:hover,
-  &:active {
-    background-color: transparent;
-  }
-}
-.dropdown-item.active {
-  color: $color-secondary;
-  background-color: transparent;
-}
-
 .btn-primary {
   background-color: $btn-primary-2;
   color: #fff !important;
@@ -155,18 +163,11 @@ a {
     border: 1px solid $btn-secondary-2 !important;
   }
 }
+
 .btn-lg {
   font-size: 1rem;
   padding: 1rem 1.25rem;
 }
-.navbar-toggler {
-  outline: none;
-
-  &:focus,
-  &:hover {
-    outline: none;
-  }
-}
 
 ul.th {
   list-style: none;
@@ -200,6 +201,63 @@ ul:not(.navbar-nav) li {
 }
 
 
+.download-selector {
+  display: inline-flex;
+
+  .divider {
+    border-right: solid 1px white;
+    margin: 0.125rem 0;
+    height: inherit;
+    z-index: 10;
+  }
+
+  .dropdown-menu {
+    border: none;
+    margin-top: 0;
+    padding-top: 0;
+  }
+
+  .btn {
+    background-color: $btn-primary-2;
+    &:hover {
+      background-color: $btn-secondary-2;
+    }
+    &:after {
+      align-self: center;
+    }
+  }
+  button {
+    &[aria-expanded='true']:after {
+      transform: rotate(-180deg);
+    }
+    span {
+      margin-right: 0.5rem;
+    }
+  }
+
+  ul {
+    list-style: none;
+    margin-left: 0!important;
+    width: 100%;
+    padding: 0;
+
+    li {
+      padding: 0;
+      margin: 0;
+
+      a {
+        padding: 0.75rem 0.5rem 0.75rem 1.25rem;
+      }
+    }
+
+    li::before {
+      content: none;
+      display: none;
+    }
+  }
+}
+
+
 .bg-white-shadow {
   background: url(../images/migen-links@2x.png);
   background-repeat: no-repeat;

sass/css/_shop.scss

@@ -186,6 +186,13 @@ button {
     .catalog-container {
         padding-bottom: 4rem;
 
+        .no-results {
+            color: rgba(255, 255, 255, 0.58);
+            display: inline-block;
+            padding: 0rem 1.5rem;
+            font-size: 1rem;
+        }
+
         .catalog-bar {
             display: flex;
             width: 100%;

static/images/icons/icon-windows.svg

@@ -0,0 +1 @@
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-linecap="round" stroke-opacity=".6" stroke-width=".35269"><path d="m0.52917 0.52917h5.5563v5.5563h-5.5563z"/><path d="m6.6146 0.52917h5.5563v5.5563h-5.5563z"/><path d="m0.52917 6.6146h5.5563v5.5563h-5.5563z"/><path d="m6.6146 6.6146h5.5563v5.5563h-5.5563z"/></g></svg>

static/js/shop/Catalog.jsx

@@ -20,7 +20,8 @@ export function Catalog() {
 
     const onClickToggleMobileSideMenu = useShopStore((state) => state.switchSideMenu);
     const isMobile = useShopStore((state) => state.isMobile);
-    const showSearch = useShopStore((state) => state.listed_cards.length > 0);
+    const showSearch = useShopStore((state) => state.listed_cards.length > 0 && state.search_bar_value.length > 0);
+    const noResults = useShopStore((state) => state.listed_cards.length === 0 && state.search_bar_value.length > 0);
 
     // #!render_count
     console.log("Catalog renders: ", renderCount)
@@ -36,8 +37,6 @@ export function Catalog() {
                     ref={provided.innerRef}
                     {...provided.droppableProps}>
 
-
-
                     <div className="catalog-bar">
                         <SearchBar/>
 
@@ -50,7 +49,9 @@ export function Catalog() {
                         ) : null}
                     </div>
 
-                    {showSearch ? <CatalogSearchResult/> : <CatalogGroups/>}
+                    {(showSearch && <CatalogSearchResult/>) ||
+                        (noResults && <p className="no-results">No results</p>) ||
+                        <CatalogGroups/>}
 
                     {provided.placeholder && (
                         <div style={{display: 'none'}}>

static/js/shop/ProductItem.jsx

@@ -6,9 +6,33 @@ import {useShopStore} from "./shop_store";
 // #!render_count
 import {useRenderCount} from "@uidotdev/usehooks";
 
+
+function DatasheetLink({datasheet_file, datasheet_name}) {
+    return datasheet_file && datasheet_name && (<div className="ds">
+        <span className='doc-icon'></span>
+        <a href={datasheet_file} target="_blank" rel="noopener noreferrer">
+            {datasheet_name}
+        </a>
+    </div>)
+}
+
+function CardSpecs({specs}) {
+    return specs && specs.length > 0 && (<ul>
+        {specs.map((spec, index) =>
+            <li key={index}>{spec}</li>
+        )}
+    </ul>)
+}
+
+function AddButton({onAdd}) {
+    return <button onClick={onAdd}>
+        <img src="/images/shop/icon-add.svg" alt="add"/>
+    </button>
+}
+
 /**
  * Component that renders a product.
- * Used in the aside (e.g catalog of product)
+ * Used in the aside (e.g catalog of products)
  */
 export function ProductItem({card_index}) {
     // #!render_count
@@ -16,33 +40,14 @@ export function ProductItem({card_index}) {
 
     const getCardDescription = useShopStore((state) => state.getCardDescription);
     const currency = useShopStore((state) => state.currency);
-    const onAddCard = useShopStore((state) => state.addCardFromCatalog);
+    const addCardFromCatalog = useShopStore((state) => state.addCardFromCatalog);
     const card = getCardDescription(card_index);
 
     // #!render_count
     console.log("ProductItem renders: ", renderCount)
 
-
-    const render_specs = (card.specs && card.specs.length > 0 && (
-        <ul>
-            {card.specs.map((spec, index) =>
-                <li key={index}>{spec}</li>
-            )}
-        </ul>
-    ));
-
-    const render_datasheet_link = (card.datasheet_file && card.datasheet_name && (
-        <div className="ds">
-            <span className='doc-icon'></span>
-            <a href={card.datasheet_file} target="_blank" rel="noopener noreferrer">
-                {card.datasheet_name}
-            </a>
-        </div>
-    ));
-
     return (
         <section className="productItem">
-
             <div className="content">
                 <h3 style={{'marginBottom': card.name_codename ? '5px' : '20px'}}>{card.name_number} {card.name}</h3>
                 {card.name_codename ? (
@@ -51,16 +56,13 @@ export function ProductItem({card_index}) {
 
                 <div className="price">{`${currency} ${formatMoney(card.price)}`}</div>
 
-                {render_specs}
+                <CardSpecs specs={card.specs}/>
 
-                {render_datasheet_link}
+                <DatasheetLink datasheet_file={card.datasheet_file} datasheet_name={card.datasheet_name}/>
             </div>
 
             <div className="content">
-
-                <button onClick={() => onAddCard(null, card_index, null)}>
-                    <img src="/images/shop/icon-add.svg" alt="add"/>
-                </button>
+                <AddButton onAdd={() => addCardFromCatalog(null, card_index, null)} />
 
                 <Draggable draggableId={card.id + card_index} index={card_index}>
                     {(provided, snapshot) => (
@@ -83,10 +85,7 @@ export function ProductItem({card_index}) {
                         </React.Fragment>
                     )}
                 </Draggable>
-
             </div>
-
         </section>
     );
-
 }

static/js/shop/options/DialogPopup.jsx

@@ -12,7 +12,7 @@ export function DialogPopup({options, data, target, id, big, first, last, option
         }
     );
 
-    let div_classes = `overlayVariant border rounded ${big ? "overlay-bigcard" : "overlay-smallcard"} ${(!big && first) ? "overlay-first" : ""} ${(!big && last) ? "overlay-last" : ""} ${options_class || ""}`;
+    let div_classes = `overlayVariant border rounded ${big ? "overlay-bigcard" : "overlay-smallcard"} ${(!big && first) ? "overlay-first" : ""} ${(!big && last && !first) ? "overlay-last" : ""} ${options_class || ""}`;
     const handleClick = (_event) => {
         setShow(!show);
     };

static/js/shop/options/components/Line.jsx

@@ -39,9 +39,10 @@ class Line extends Component {
             <div className="shop-line" key={this.props.id}>
                 <label htmlFor={key} className="form-label">
                     {this.props.icon && <img src={`/images${this.props.icon}`} className="options-icon"/>}
-                    {this.props.title}:
+                    {this.props.title}
+                    {this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
+                    :
                 </label>
-                {this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
                 <input type="text" className={`form-control form-control-sm ${this.state.valid ? "" : "options-invalid"}`} id={key} onChange={this.handleChange}
                        value={this.state.text}/>
             </div>

static/js/shop/options/components/Switch.jsx

@@ -49,8 +49,8 @@ class Switch extends Component {
                     <label className="form-check-label" htmlFor={key} style={{"display": "inline"}}>
                         {this.props.icon && <img src={`/images${this.props.icon}`} className="options-icon"/>}
                         {this.props.title}
+                        {this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
                     </label>
-                    {this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
                 </div>
             </div>
         );

static/js/shop/options/components/SwitchLine.jsx

@@ -65,8 +65,8 @@ class SwitchLine extends Component {
                     <label className="form-check-label" htmlFor={key + "switch"}>
                         {this.props.icon && <img src={`/images${this.props.icon}`} className="options-icon"/>}
                         {this.props.title}
+                        {this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
                     </label>
-                    {this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
                 </div>
                 <input type="text" className={`form-control form-control-sm ${this.state.valid ? "" : "options-invalid"}`} id={key + "line"} onChange={this.handleText}
                        value={this.state.text} disabled={!this.state.checked}/>

static/js/shop/shop_store.js

@@ -553,6 +553,7 @@ const useCart = ((set, get) => ({
     delCrate: (id) => {
         get()._delCrate(id);
         get().fillOrderExtData();
+        get()._updateTotalOrderPrice();
     },
 
     addCardFromCatalog: (crate_to, index_from, index_to, just_mounted) => {
@@ -594,6 +595,7 @@ const useCart = ((set, get) => ({
     clearCrate: (id) => {
         get()._clearCrate(id);
         get().fillWarnings(id);
+        get()._updateTotalOrderPrice();
     },
 
     updateOptions: (crate_id, index, new_options) => {

static/js/shop_data.js

@@ -51,8 +51,8 @@ const shop_data = {
           title: "Optional pre-installed NUC mini-computer",
           outvar: "nuc",
           tip: "Pre-installed NixOS desktop with ARTIQ and other scientific software. " +
-               "Hardware: Intel® NUC 13 Pro Kit NUC13ANKi7, i7-1360P CPU, " +
-               "32GB RAM, 1TB NVMe. Other options contact us.",
+               "Hardware: ASUS® NUC 14 Pro Kit, Intel® i7-155H CPU, " +
+               "32GB RAM, 1TB NVMe. For other options contact us.",
           fallback: true,
         }},
         {
@@ -179,7 +179,6 @@ const shop_data = {
         'Price includes bitstream generation, flashing, testing, and firmware updates for 1 year (USD 1,400.00).',
       ],
       size: 'big',
-      type: 'kasli',
       options: [
         {type: "Radio", args: {title: "DRTIO role", outvar: "drtio_role", variants: ["standalone", "master", "satellite"], tip: "Distributed Real Time Input/Output allows ARTIQ RTIO channels to be distributed among several satellite devices synchronized and controlled by a central core(master) device. Standalone option disables this feature."}},
           {
@@ -244,7 +243,6 @@ const shop_data = {
         '4 MMCX clock outputs.',
       ],
       size: 'big',
-      type: 'kasli',
       hp: 8,
       nbrSlotMin: 0,
       nbrSlotMax: 12,
@@ -316,7 +314,6 @@ const shop_data = {
         'A pair of VHDCI carriers is a simple, low-latency and low-cost alternative to DRTIO for some applications.',
       ],
       size: 'big',
-      type: 'vhdcicarrier',
       resources: [
         {name: "eem", max: 8},
       ],
@@ -347,7 +344,6 @@ const shop_data = {
       datasheet_file: '/docs/sinara-datasheets/2118-2128.pdf',
       datasheet_name: '2118/2128 BNC/SMA-TTL datasheet',
       size: 'big',
-      type: null,
       options: [
         {
           "if": [
@@ -457,7 +453,6 @@ const shop_data = {
         }
       ],
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source"
       ],
@@ -549,7 +544,6 @@ const shop_data = {
         }
       ],
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source"
       ],
@@ -636,7 +630,6 @@ const shop_data = {
         }
       ],
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source"
       ],
@@ -660,7 +653,8 @@ const shop_data = {
         'Digital step attenuator 0 to -31.5dB.',
         'RF switch (1ns temporal resolution), 70dB isolation.',
         'AD9910 and AD9912 cards can be used at the same time in the same crate.',
-        'External 5W power amplifier is available separately, leave us a note if interested.'
+        'Power amplifier (e.g. AOM driver) options available, contact us for details.',
+        'Can be integrated and shipped with single- or double-pass fiber-coupled AOM at most wavelengths 400nm-1650nm, AOM driver, low-noise monitor PD and SU-Servo to reduce laser, AOM and fiber noise. Contact us for details.'
       ],
       datasheet_file: '/docs/sinara-datasheets/4410-4412.pdf',
       datasheet_name: '4410/4412 Urukul datasheet',
@@ -699,7 +693,6 @@ const shop_data = {
         }
       ],
       size: 'small',
-      type: 'urukul',
       warnings: [
         "no_eem_source",
         "no_clk_source"
@@ -726,7 +719,8 @@ const shop_data = {
         'RF switch (1ns temporal resolution), 70dB isolation.',
         'AD9912 chip.',
         'AD9910 and AD9912 cards can be used at the same time in the same crate.',
-        'External 5W power amplifier is available separately, leave us a note if interested.'
+        'Power amplifier (e.g. AOM driver) options available, contact us for details.',
+        'Can be integrated and shipped with single- or double-pass fiber-coupled AOM at most wavelengths 400nm-1650nm, and AOM driver. Contact us for details.'
       ],
       datasheet_file: '/docs/sinara-datasheets/4410-4412.pdf',
       datasheet_name: '4410/4412 Urukul datasheet',
@@ -737,7 +731,6 @@ const shop_data = {
             fallback: {text: "125 MHz", checked: false}}}
       ],
       size: 'small',
-      type: 'urukul',
       warnings: [
         "no_eem_source",
         "no_clk_source"
@@ -758,6 +751,7 @@ const shop_data = {
       specs: [
         '2x 1.25 GS/s IQ upconverters.',
         'dual IQ mixer + 0.3 GHz to 4.8 GHz VCO + PLL.',
+        'up to 16 dynamic tones using MIQRO gateware (available separately from QUARTIQ).',
         '31.5 dB range digital step attenuator (similar to Urukul).',
         '2 channels of 5 MS/s ADC (similar to Sampler).',
         'Artix-7 FPGA.',
@@ -771,7 +765,6 @@ const shop_data = {
         {type: "Radio", args: {title: "Variant", outvar: "variant", variants: ["Baseband", "Upconverter"], fallback: 1}},
       ],
       size: 'small',
-      type: 'urukul',
       warnings: [
         "no_eem_source",
         "no_clk_source"
@@ -814,7 +807,6 @@ const shop_data = {
       datasheet_file: '/docs/sinara-datasheets/5432.pdf',
       datasheet_name: '5432 Zotino datasheet',
       size: 'small',
-      type: 'zotino',
       warnings: [
         "no_eem_source",
         "idc_resource"
@@ -844,7 +836,6 @@ const shop_data = {
         'Channels can also be broken out to BNC or SMA using IDC-BNC, IDC-SMA or IDC-MCX cards.'
       ],
       size: 'small',
-      type: 'zotino',
       warnings: [
         "no_eem_source",
         "idc_resource",
@@ -870,7 +861,6 @@ const shop_data = {
         'Breaking out all 32 channels from a Zotino requires 4 IDC-BNC cards.'
       ],
       size: 'big',
-      type: 'idc-bnc',
       warnings: [
         "no_idc_source"
       ],
@@ -879,6 +869,43 @@ const shop_data = {
         idc: 1
       }
     },
+    'hvamp32': {
+      id: 'hvamp32',
+      name: 'HV Amplifier',
+      name_number: '5633',
+      name_codename: '',
+      price: 1500,
+      image: '/images/shop/graphic-03_HVAMP32.svg',
+      specs: [
+        'Amplifier: LTC6090 or OPA462, 32 channels.',
+        'Amplification range up to ±25V and ±55V available.',
+        'Over-temperature protection.',
+        'External 12V power supply.',
+        'Slew rate 21V/us typical.',
+        'Bandwidth: 12MHz/gain, for ±25V range BW is 4.8MHz typical.',
+        'The same connector as in Zotino and Fastino.'
+      ],
+      options: [
+        {type: "Radio",
+          args: {
+            title: "Amplification range",
+            outvar: "hvamp",
+            variants: ["±25V", "±55V"],
+            fallback: 0
+        }},
+      ],
+      size: 'small',
+      warnings: [
+        "no_idc_source"
+      ],
+      resources: [
+        {name: "idc", max: 4}
+      ],
+      consumes: {
+        hp: 4,
+        idc: 4
+      }
+    },
     'idc-sma-adapter': {
       id: 'idc-sma-adapter',
       name: 'SMA-IDC',
@@ -892,7 +919,6 @@ const shop_data = {
         'Breaking out all 32 channels from a Zotino requires 4 SMA-IDC cards.'
       ],
       size: 'small',
-      type: 'idc-bnc',
       warnings: [
         "no_idc_source"
       ],
@@ -901,6 +927,27 @@ const shop_data = {
         idc: 1
       }
     },
+    'idc-mcx-adapter': {
+      id: 'idc-mcx-adapter',
+      name: 'MCX-IDC',
+      name_number: '5538',
+      name_codename: '',
+      price: 320,
+      image: '/images/shop/graphic-03_MCX-IDC32.svg',
+      specs: [
+        'Breaks out analog signals from Zotino or HD68-IDC to MCX connectors.',
+        'Each card provides 32 channels.',
+      ],
+      size: 'big',
+      type: 'idc-bnc',
+      warnings: [
+        "no_idc_source"
+      ],
+      consumes: {
+        hp: 8,
+        idc: 4
+      }
+    },
     'hd68-idc-adapter': {
       id:'hd68-idc-adapter',
       name: 'HD68-IDC',
@@ -912,7 +959,6 @@ const shop_data = {
         'Connects an external HD68 cable to IDC-BNC, IDC-SMA or IDC-MCX cards.',
       ],
       size: 'small',
-      type: 'hd68',
       options: [
         {type: "Radio", args: {title: "Cable length", outvar: "hd68_cable_len", variants: ["1 M", "2 M", "3 M"], tip: "The desired length of the HD68 cable", fallback: 1}},
       ],
@@ -969,7 +1015,6 @@ const shop_data = {
         }
       ],
       size: 'big',
-      type: 'novo',
       warnings: [
         "no_eem_source"
       ],
@@ -996,7 +1041,6 @@ const shop_data = {
         {type: "Radio", args: {title: "Connectors", outvar: "n_eem", variants: ["1 EEM", "2 EEM", "3 EEM"], tip: "Number of EEM ports to use.", fallback: 1}},
       ],
       size: 'small',
-      type: 'koster',
       warnings: [
         "no_eem_source"
       ],
@@ -1025,7 +1069,6 @@ const shop_data = {
       ],
       options_class: "clocker",
       size: 'small',
-      type: 'clocker',
       warnings: [
         "no_eem_source",
         "no_clk_source",
@@ -1066,7 +1109,6 @@ const shop_data = {
       ],
       options_class: "stabilizer",
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source"
       ],
@@ -1101,7 +1143,6 @@ const shop_data = {
       ],
       options_class: "stabilizer",
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source"
       ],
@@ -1131,7 +1172,6 @@ const shop_data = {
             fallback: {text: "125 MHz", checked: false}}}
       ],
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source",
         "no_clk_source"
@@ -1160,7 +1200,6 @@ const shop_data = {
             fallback: {text: "125 MHz", checked: false}}}
       ],
       size: 'big',
-      type: null,
       warnings: [
         "no_eem_source",
         "no_clk_source"
@@ -1190,7 +1229,6 @@ const shop_data = {
         {type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}}
       ],
       size: 'small',
-      type: null,
       warnings: [
         "no_eem_source"
       ],
@@ -1214,7 +1252,6 @@ const shop_data = {
         'Can stabilize temperature of Sinara 5432 DAC or external devices containing TEC and thermistor.'
       ],
       size: 'small',
-      type: null,
       consumes: {
         hp: 4
       },
@@ -1238,7 +1275,6 @@ const shop_data = {
         'Included remote analog front-end (AFE) board converts differential signals to ±10V single-ended at the point of use, with additional gain and filtering.',
       ],
       size: 'big',
-      type: null,
       warnings: [
         "no_eem_source",
         "no_clk_source"
@@ -1273,13 +1309,12 @@ const shop_data = {
         {type: "Switch", args: {title: "Termination #1", outvar: "term_1", tip: "Enable termination on ADC channel #1"}}
       ],
       size: 'big',
-      type: null,
       warnings: [
         "no_eem_source",
         "no_clk_source"
       ],
       consumes: {
-        hp: 4,
+        hp: 8,
         eem: 1,
         clk: 1
       }
@@ -1303,10 +1338,40 @@ const shop_data = {
         "Optional - external power brick will be shipped free of charge if removed."
       ],
       size: 'big',
+      warnings: [],
+      consumes: {
+        hp: 8,
+      },
+    },
+    'kirdy': {
+      id: 'kirdy',
+      name: 'Laser diode driver',
+      name_number: '1550',
+      name_codename: 'Kirdy',
+      price: 1700,
+      image: '/images/shop/graphic-03_Kirdy.svg',
+      specs: [
+        "Precision LD driver: 300mA max output current, 20-bit resolution, 4V compliance voltage.",
+        "RMS noise 10Hz-1MHz: <200nA, density <300pA/√Hz.",
+        "Low-frequency modulation input, DC-18MHz 3dB bandwidth, suitable for laser locks and linewidth reduction.",
+        "High-frequency Bias-T modulation input, suitable for PDH sideband generation.",
+        "Monitor photodiode and LD protection.",
+        "Temperature controller: ±1A max current, sub-mK stability.",
+        "Full digital control and power over Ethernet.",
+        "Can ship with single-frequency narrow-linewidth laser pre-installed (1270-1610nm from USD +200.00, 633-1064nm from USD +4,000.00), fiber output on front panel.",
+        "Also suitable for commercial or homebuilt ECDL heads (with additional piezo driver), and injection-locked Fabry-Perot diodes."
+      ],
+      options: [
+        {type: "Line", args: {title: "IP", outvar: "ip",
+            validator: {name: "ipv4"},
+            fallback: "192.168.1.128/24",
+            tip: "Set up IP address used by the device."}},
+      ],
+      size: 'big',
       type: null,
       warnings: [],
       consumes: {
-        hp: 4,
+        hp: 8,
       },
     },
   },
@@ -1344,12 +1409,14 @@ const shop_data = {
           itemIds: [
             'zotino',
             'fastino',
+            'hvamp32',
             'novo',
             'shuttler']},
         { name: 'Adapters',
           itemIds: [
               'idc-bnc-adapter',
               'idc-sma-adapter',
+              'idc-mcx-adapter',
               'hd68-idc-adapter',
               'vhdcicarrier']},
         { name: 'Servos',
@@ -1363,6 +1430,7 @@ const shop_data = {
           itemIds: [
             'koster',
             'eem_pwr_mod',
+            'kirdy',
           ]}
       ],
     },

templates/index.html

@@ -53,12 +53,29 @@
               <a href="{{ get_url(path='@/experiment-control/place-order.md') }}" class="btn btn-primary btn-inversed btn-lg">Order hardware</a>
               <a href="https://m-labs.hk/artiq/manual/" class="btn btn-primary btn-lg">Manual</a>
               <a href="https://forum.m-labs.hk" class="btn btn-primary btn-lg">Forum</a>
-              <a href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1" class="btn btn-primary btn-lg d-inline-flex">
-                  <img src="/images/icons/icon-download.svg" class="d-inline-block align-self-center mx-1" style="height: 1rem" alt="download">
-                Windows installer
-              </a>
               <a href="{{ get_url(path='@/experiment-control/artiq.md') }}" class="btn btn-primary btn-lg">More...</a>
-
+              <div class="btn-group download-selector">
+                <a class="btn btn-primary btn-lg d-inline-flex" href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1">
+                  <img src="/images/icons/icon-windows.svg" class="d-inline-block align-self-center mx-1" style="height: 1rem" alt="windows">
+                  <span class="d-inline-block">Download <sup>.exe</sup></span>
+                </a>
+                <div class="divider"></div>
+                <button type="button" class="btn btn-primary btn-lg dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                  <span>stable</span>
+                </button>
+                <ul class="dropdown-menu shadow dropdown-menu-end">
+                  <li>
+                    <a class="dropdown-item" href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1">
+                    ARTIQ-8 (stable) for Windows
+                    </a>
+                  </li>
+                  <li>
+                    <a class="dropdown-item" href="https://nixbld.m-labs.hk/job/artiq/extra-beta/msys2-offline-installer/latest/download/1">
+                      ARTIQ-9 (beta) for Windows
+                    </a>
+                  </li>
+                </ul>
+              </div>
             </div>
 
           </div>