Fossil SCM

Improvements and fixes to the new skin editing.

drh 2017-12-03 01:29 UTC skin-setup-refactor
Commit 38762b9f6c56ad3f39ebc405abb1e739ff0cbe391f47c5a13afa7044e2219cf4
Parent 2179ffd47a81e8c…
1 file changed +18 -21
~ src/skins.c
M src/skins.c
+18 -21
--- src/skins.c
+++ src/skins.c
@@ -440,12 +440,13 @@
440440
 zNewName, zCurrent
441441
 );
442442
 return 0;
443443
 }
444444
445
+#if 0
445446
 /*
446
-** WEBPAGE: setup_skin_old
447
+** WEB**PAGE: setup_skin_old
447448
 **
448449
 ** Show a list of available skins with buttons for selecting which
449450
 ** skin to use. Requires Setup privilege.
450451
 */
451452
 void setup_skin_old(void){
@@ -599,11 +600,11 @@
599600
 }
600601
 @ </table>
601602
 style_footer();
602603
 db_end_transaction(0);
603604
 }
604
-
605
+#endif
605606
606607
 /*
607608
 ** WEBPAGE: setup_skinedit
608609
 **
609610
 ** Edit aspects of a skin determined by the w= query parameter.
@@ -725,22 +726,23 @@
725726
 static void skin_initialize_draft(int iSkin, const char *zTemplate){
726727
 int i;
727728
 if( zTemplate==0 ) return;
728729
 if( strcmp(zTemplate, "current")==0 ){
729730
 for(i=0; i<count(azSkinFile); i++){
730
- db_unset_mprintf("draft%d-%s", 0, iSkin, azSkinFile[i]);
731
- }
732
- }else{
733
- for(i=0; i<count(aBuiltinSkin); i++){
734
- if( strcmp(zTemplate, aBuiltinSkin[i].zLabel)==0 ){
735
- for(i=0; i<count(azSkinFile); i++){
736
- char *zKey = mprintf("skins/%s/%s.txt", zTemplate, azSkinFile[i]);
737
- db_set_mprintf("draft%d-%s", builtin_text(zKey), 0,
738
- iSkin, azSkinFile[i]);
739
- }
740
- break;
741
- }
731
+ db_set_mprintf("draft%d-%s", db_get(azSkinFile[i],""), 0,
732
+ iSkin, azSkinFile[i]);
733
+ }
734
+ return;
735
+ }
736
+ for(i=0; i<count(aBuiltinSkin); i++){
737
+ if( strcmp(zTemplate, aBuiltinSkin[i].zLabel)==0 ){
738
+ for(i=0; i<count(azSkinFile); i++){
739
+ char *zKey = mprintf("skins/%s/%s.txt", zTemplate, azSkinFile[i]);
740
+ db_set_mprintf("draft%d-%s", builtin_text(zKey), 0,
741
+ iSkin, azSkinFile[i]);
742
+ }
743
+ return;
742744
 }
743745
 }
744746
 }
745747
746748
 /*
@@ -774,17 +776,12 @@
774776
 );
775777
 }
776778
777779
 /* Publish draft iSkin */
778780
 for(i=0; i<count(azSkinFile); i++){
779
- db_multi_exec(
780
- "UPDATE config"
781
- " SET value=(SELECT value FROM config AS x"
782
- " WHERE x.name = printf('draft%d-%%s',config.name)),"
783
- " mtime=now()"
784
- " WHERE name IN ('css','header','footer','details')", iSkin
785
- );
781
+ char *zNew = db_get_mprintf("draft%d-%s", "", iSkin, azSkinFile[i]);
782
+ db_set(azSkinFile[i], zNew, 0);
786783
 }
787784
 }
788785
789786
 /*
790787
 ** WEBPAGE: setup_skin
791788
--- src/skins.c
+++ src/skins.c
@@ -440,12 +440,13 @@
440 zNewName, zCurrent
441 );
442 return 0;
443 }
444
 
445 /*
446 ** WEBPAGE: setup_skin_old
447 **
448 ** Show a list of available skins with buttons for selecting which
449 ** skin to use. Requires Setup privilege.
450 */
451 void setup_skin_old(void){
@@ -599,11 +600,11 @@
599 }
600 @ </table>
601 style_footer();
602 db_end_transaction(0);
603 }
604
605
606 /*
607 ** WEBPAGE: setup_skinedit
608 **
609 ** Edit aspects of a skin determined by the w= query parameter.
@@ -725,22 +726,23 @@
725 static void skin_initialize_draft(int iSkin, const char *zTemplate){
726 int i;
727 if( zTemplate==0 ) return;
728 if( strcmp(zTemplate, "current")==0 ){
729 for(i=0; i<count(azSkinFile); i++){
730 db_unset_mprintf("draft%d-%s", 0, iSkin, azSkinFile[i]);
731 }
732 }else{
733 for(i=0; i<count(aBuiltinSkin); i++){
734 if( strcmp(zTemplate, aBuiltinSkin[i].zLabel)==0 ){
735 for(i=0; i<count(azSkinFile); i++){
736 char *zKey = mprintf("skins/%s/%s.txt", zTemplate, azSkinFile[i]);
737 db_set_mprintf("draft%d-%s", builtin_text(zKey), 0,
738 iSkin, azSkinFile[i]);
739 }
740 break;
741 }
 
742 }
743 }
744 }
745
746 /*
@@ -774,17 +776,12 @@
774 );
775 }
776
777 /* Publish draft iSkin */
778 for(i=0; i<count(azSkinFile); i++){
779 db_multi_exec(
780 "UPDATE config"
781 " SET value=(SELECT value FROM config AS x"
782 " WHERE x.name = printf('draft%d-%%s',config.name)),"
783 " mtime=now()"
784 " WHERE name IN ('css','header','footer','details')", iSkin
785 );
786 }
787 }
788
789 /*
790 ** WEBPAGE: setup_skin
791
--- src/skins.c
+++ src/skins.c
@@ -440,12 +440,13 @@
440 zNewName, zCurrent
441 );
442 return 0;
443 }
444
445 #if 0
446 /*
447 ** WEB**PAGE: setup_skin_old
448 **
449 ** Show a list of available skins with buttons for selecting which
450 ** skin to use. Requires Setup privilege.
451 */
452 void setup_skin_old(void){
@@ -599,11 +600,11 @@
600 }
601 @ </table>
602 style_footer();
603 db_end_transaction(0);
604 }
605 #endif
606
607 /*
608 ** WEBPAGE: setup_skinedit
609 **
610 ** Edit aspects of a skin determined by the w= query parameter.
@@ -725,22 +726,23 @@
726 static void skin_initialize_draft(int iSkin, const char *zTemplate){
727 int i;
728 if( zTemplate==0 ) return;
729 if( strcmp(zTemplate, "current")==0 ){
730 for(i=0; i<count(azSkinFile); i++){
731 db_set_mprintf("draft%d-%s", db_get(azSkinFile[i],""), 0,
732 iSkin, azSkinFile[i]);
733 }
734 return;
735 }
736 for(i=0; i<count(aBuiltinSkin); i++){
737 if( strcmp(zTemplate, aBuiltinSkin[i].zLabel)==0 ){
738 for(i=0; i<count(azSkinFile); i++){
739 char *zKey = mprintf("skins/%s/%s.txt", zTemplate, azSkinFile[i]);
740 db_set_mprintf("draft%d-%s", builtin_text(zKey), 0,
741 iSkin, azSkinFile[i]);
742 }
743 return;
744 }
745 }
746 }
747
748 /*
@@ -774,17 +776,12 @@
776 );
777 }
778
779 /* Publish draft iSkin */
780 for(i=0; i<count(azSkinFile); i++){
781 char *zNew = db_get_mprintf("draft%d-%s", "", iSkin, azSkinFile[i]);
782 db_set(azSkinFile[i], zNew, 0);
 
 
 
 
 
783 }
784 }
785
786 /*
787 ** WEBPAGE: setup_skin
788

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button