Diff
Not logged in

Differences From Artifact [22005f3b97]:

To Artifact [3e42e686c6]:


991
992
993
994
995
996
997

998
999
1000
1001
1002
1003
1004
1005
  CX("<span>%h</span></span>", zLabel);
}

enum fileedit_render_preview_flags {
FE_PREVIEW_LINE_NUMBERS = 1
};
enum fileedit_render_modes {

FE_RENDER_PLAIN_TEXT = 0,
FE_RENDER_HTML,
FE_RENDER_WIKI
};

static int fileedit_render_mode_for_mimetype(const char * zMimetype){
  int rc = FE_RENDER_PLAIN_TEXT;
  if( zMimetype ){







>
|







991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
  CX("<span>%h</span></span>", zLabel);
}

enum fileedit_render_preview_flags {
FE_PREVIEW_LINE_NUMBERS = 1
};
enum fileedit_render_modes {
FE_RENDER_GUESS = 0,
FE_RENDER_PLAIN_TEXT,
FE_RENDER_HTML,
FE_RENDER_WIKI
};

static int fileedit_render_mode_for_mimetype(const char * zMimetype){
  int rc = FE_RENDER_PLAIN_TEXT;
  if( zMimetype ){
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025

1026

1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
}

/*
** Performs the PREVIEW mode for /filepage.
*/
static void fileedit_render_preview(Blob * pContent,
                                    const char *zFilename,
                                    int flags,
                                    int nIframeHeightEm){
  const char * zMime;
  int renderMode = FE_RENDER_PLAIN_TEXT;
  zMime = mimetype_from_name(zFilename);

    renderMode = fileedit_render_mode_for_mimetype(zMime);

  CX("<div class='fileedit-preview'>");
  CX("<div>Preview</div>");
  switch(renderMode){
    case FE_RENDER_HTML:{
      char * z64 = encode64(blob_str(pContent), blob_size(pContent));
      CX("<iframe width='100%%' frameborder='0' marginwidth='0' "
         "style='height:%dem' "
         "marginheight='0' sandbox='allow-same-origin' id='ifm1' "
         "src='data:text/html;base64,%z'"
         "></iframe>", nIframeHeightEm ? nIframeHeightEm : 40,
         z64);
      break;
    }
    case FE_RENDER_WIKI:
      wiki_render_by_mimetype(pContent, zMime);
      break;
    case FE_RENDER_PLAIN_TEXT:
    default:{
      const char *zExt = strrchr(zFilename,'.');
      const char *zContent = blob_str(pContent);
      if(FE_PREVIEW_LINE_NUMBERS & flags){
        output_text_with_line_numbers(zContent, "on");
      }else if(zExt && zExt[1]){
        CX("<pre><code class='language-%s'>%h</code></pre>",







|


<

>

>
















<







1015
1016
1017
1018
1019
1020
1021
1022
1023
1024

1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044

1045
1046
1047
1048
1049
1050
1051
}

/*
** Performs the PREVIEW mode for /filepage.
*/
static void fileedit_render_preview(Blob * pContent,
                                    const char *zFilename,
                                    int flags, int renderMode,
                                    int nIframeHeightEm){
  const char * zMime;

  zMime = mimetype_from_name(zFilename);
  if(FE_RENDER_GUESS==renderMode){
    renderMode = fileedit_render_mode_for_mimetype(zMime);
  }
  CX("<div class='fileedit-preview'>");
  CX("<div>Preview</div>");
  switch(renderMode){
    case FE_RENDER_HTML:{
      char * z64 = encode64(blob_str(pContent), blob_size(pContent));
      CX("<iframe width='100%%' frameborder='0' marginwidth='0' "
         "style='height:%dem' "
         "marginheight='0' sandbox='allow-same-origin' id='ifm1' "
         "src='data:text/html;base64,%z'"
         "></iframe>", nIframeHeightEm ? nIframeHeightEm : 40,
         z64);
      break;
    }
    case FE_RENDER_WIKI:
      wiki_render_by_mimetype(pContent, zMime);
      break;

    default:{
      const char *zExt = strrchr(zFilename,'.');
      const char *zContent = blob_str(pContent);
      if(FE_PREVIEW_LINE_NUMBERS & flags){
        output_text_with_line_numbers(zContent, "on");
      }else if(zExt && zExt[1]){
        CX("<pre><code class='language-%s'>%h</code></pre>",
1089
1090
1091
1092
1093
1094
1095

1096
1097
1098
1099
1100
1101
1102
  const char * zFileMime = 0;           /* File mime type guess */
  CheckinMiniInfo cimi;                 /* Checkin state */
  int submitMode = SUBMIT_NONE;         /* See mapping below */
  int vid, newVid = 0;                  /* checkin rid */
  int frid = 0;                         /* File content rid */
  int previewLn = P("preview_ln")!=0;   /* Line number mode */
  int previewHtmlHeight = 0;            /* iframe height (EMs) */

  char * zFileUuid = 0;                 /* File content UUID */
  Blob err = empty_blob;                /* Error report */
  const char * zFlagCheck = 0;          /* Temp url flag holder */
  Blob endScript = empty_blob;          /* Script code to run at the
                                           end. This content will be
                                           combined into a single JS
                                           function call, thus each







>







1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
  const char * zFileMime = 0;           /* File mime type guess */
  CheckinMiniInfo cimi;                 /* Checkin state */
  int submitMode = SUBMIT_NONE;         /* See mapping below */
  int vid, newVid = 0;                  /* checkin rid */
  int frid = 0;                         /* File content rid */
  int previewLn = P("preview_ln")!=0;   /* Line number mode */
  int previewHtmlHeight = 0;            /* iframe height (EMs) */
  int previewRenderMode = FE_RENDER_GUESS; /* preview mode */
  char * zFileUuid = 0;                 /* File content UUID */
  Blob err = empty_blob;                /* Error report */
  const char * zFlagCheck = 0;          /* Temp url flag holder */
  Blob endScript = empty_blob;          /* Script code to run at the
                                           end. This content will be
                                           combined into a single JS
                                           function call, thus each
1340
1341
1342
1343
1344
1345
1346
1347
1348


1349

1350
















1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
  CX("<button type='submit' name='submit' value='1'>"
     "Save</button>");
  CX("<button type='submit' name='submit' value='2'>"
     "Preview</button>");
  CX("<button type='submit' name='submit' value='3'>"
     "Diff (TODO)</button>");
  {
    /* Options which depend on the current submitMode or
       the file's preview rendering mode. */


    const int renderMode = fileedit_render_mode_for_mimetype(zFileMime);

    CX("<br>");
















    if(FE_RENDER_HTML==renderMode){
      /* HTML preview mode iframe height... */
      int i;
      if(submitMode==SUBMIT_PREVIEW){
        previewHtmlHeight = atoi(PD("preview_html_ems","0"));
      }else{
        previewHtmlHeight = 40;
      }
      /* Allow selection of HTML preview iframe height */
      CX("<select name='preview_html_ems' "
         "title='Height (in EMs) of the iframe used for HTML "
         "preview.'>\n");
      CX("<option disabled value='40'>HTML Preview Height (EMs)"
         "</option>\n");
      for( i = 20; i <= 100; i+=20 ){
        CX("<option value='%d'%s>%d</option>\n",
           i, (previewHtmlHeight==i) ? " selected" : "", i);
      }
      CX("</select>\n");
    }
    else if(FE_RENDER_PLAIN_TEXT == renderMode){
      style_labeled_checkbox("preview_ln",
                             "Add line numbers to plain-text previews?",
                             "1",
                             "If on, plain-text files (only) will get "
                             "line numbers added to the preview.",
                             previewLn);
    }







<
|
>
>
|
>

>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|



















|







1342
1343
1344
1345
1346
1347
1348

1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
  CX("<button type='submit' name='submit' value='1'>"
     "Save</button>");
  CX("<button type='submit' name='submit' value='2'>"
     "Preview</button>");
  CX("<button type='submit' name='submit' value='3'>"
     "Diff (TODO)</button>");
  {

    /* Preview rendering mode selection... */
    previewRenderMode = atoi(PD("preview_render_mode","0"));
    if(0==previewRenderMode){
      previewRenderMode = fileedit_render_mode_for_mimetype(zFileMime);
    }
    CX("<br>");
    CX("<select name='preview_render_mode'>\n");
    CX("<option value='%d' disabled>Preview Mode</option>",
       FE_RENDER_GUESS);
    CX("<option value='%d'%s>Guess</option>",
       FE_RENDER_GUESS,
       FE_RENDER_GUESS==previewRenderMode ? " selected" : "");
    CX("<option value='%d'%s>Wiki/Markdown</option>",
       FE_RENDER_WIKI,
       FE_RENDER_WIKI==previewRenderMode ? " selected" : "");
    CX("<option value='%d'%s>HTML (iframe)</option>",
       FE_RENDER_HTML,
       FE_RENDER_HTML==previewRenderMode ? " selected" : "");
    CX("<option value='%d'%s>Plain Text</option>",
       FE_RENDER_PLAIN_TEXT,
       FE_RENDER_PLAIN_TEXT==previewRenderMode ? " selected" : "");
    CX("</select>\n");
    if(FE_RENDER_HTML==previewRenderMode){
      /* HTML preview mode iframe height... */
      int i;
      if(submitMode==SUBMIT_PREVIEW){
        previewHtmlHeight = atoi(PD("preview_html_ems","0"));
      }else{
        previewHtmlHeight = 40;
      }
      /* Allow selection of HTML preview iframe height */
      CX("<select name='preview_html_ems' "
         "title='Height (in EMs) of the iframe used for HTML "
         "preview.'>\n");
      CX("<option disabled value='40'>HTML Preview Height (EMs)"
         "</option>\n");
      for( i = 20; i <= 100; i+=20 ){
        CX("<option value='%d'%s>%d</option>\n",
           i, (previewHtmlHeight==i) ? " selected" : "", i);
      }
      CX("</select>\n");
    }
    else if(FE_RENDER_PLAIN_TEXT==previewRenderMode){
      style_labeled_checkbox("preview_ln",
                             "Add line numbers to plain-text previews?",
                             "1",
                             "If on, plain-text files (only) will get "
                             "line numbers added to the preview.",
                             previewLn);
    }
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
    ** be emitted below. */
    cimi.pMfOut = 0;
    blob_reset(&manifest);
  }else if(SUBMIT_PREVIEW==submitMode){
    int pflags = 0;
    if(previewLn) pflags |= FE_PREVIEW_LINE_NUMBERS;
    fileedit_render_preview(&cimi.fileContent, cimi.zFilename, pflags,
                            previewHtmlHeight);
  }else if(SUBMIT_DIFF==submitMode/*diff*/){
    fail((&err,"Diff mode is still TODO."));
  }else{
    /* Ignore invalid submitMode value */
    goto end_footer;
  }








|







1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
    ** be emitted below. */
    cimi.pMfOut = 0;
    blob_reset(&manifest);
  }else if(SUBMIT_PREVIEW==submitMode){
    int pflags = 0;
    if(previewLn) pflags |= FE_PREVIEW_LINE_NUMBERS;
    fileedit_render_preview(&cimi.fileContent, cimi.zFilename, pflags,
                            previewRenderMode, previewHtmlHeight);
  }else if(SUBMIT_DIFF==submitMode/*diff*/){
    fail((&err,"Diff mode is still TODO."));
  }else{
    /* Ignore invalid submitMode value */
    goto end_footer;
  }